sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade Utility

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-05-24 19:10:53 +02:00
parent b936946154
commit cce32a64d4
120 changed files with 2328 additions and 2971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Nazara/Shader/ShaderLangParser.cpp
View File

@@ -38,7 +38,7 @@ namespace Nz::ShaderLang
};
std::unordered_map<std::string, StructLayout> s_layoutMapping = {
{ "std140", StructLayout_Std140 }
{ "std140", StructLayout::Std140 }
};
template<typename T, typename U>
@@ -157,7 +157,7 @@ namespace Nz::ShaderLang
Consume();
ShaderAst::SamplerType samplerType;
samplerType.dim = ImageType_2D;
samplerType.dim = ImageType::E2D;
Expect(Advance(), TokenType::LessThan); //< '<'
samplerType.sampledType = ParsePrimitiveType();