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/ShaderNode/ShaderGraph.cpp
View File

@@ -463,7 +463,7 @@ Nz::ShaderAst::StatementPtr ShaderGraph::ToAst() const
for (const auto& structInfo : m_structs)
{
Nz::ShaderAst::StructDescription structDesc;
structDesc.layout = Nz::StructLayout_Std140;
structDesc.layout = Nz::StructLayout::Std140;
structDesc.name = structInfo.name;
for (const auto& memberInfo : structInfo.members)
@@ -701,7 +701,7 @@ Nz::ShaderAst::ExpressionType ShaderGraph::ToShaderExpressionType(TextureType ty
{
switch (type)
{
case TextureType::Sampler2D: return Nz::ShaderAst::SamplerType{ Nz::ImageType_2D, Nz::ShaderAst::PrimitiveType::Float32 };
case TextureType::Sampler2D: return Nz::ShaderAst::SamplerType{ Nz::ImageType::E2D, Nz::ShaderAst::PrimitiveType::Float32 };
}
assert(false);