diff --git a/include/Nazara/Renderer/ShaderBuilder.inl b/include/Nazara/Renderer/ShaderBuilder.inl index 6778eb615..05e01ed40 100644 --- a/include/Nazara/Renderer/ShaderBuilder.inl +++ b/include/Nazara/Renderer/ShaderBuilder.inl @@ -28,7 +28,7 @@ namespace Nz { namespace ShaderBuilder std::shared_ptr BuiltinBuilder::operator()(ShaderAst::BuiltinEntry builtin) const { - ShaderAst::ExpressionType exprType = ShaderAst::ExpressionType::None; + ShaderAst::ExpressionType exprType = ShaderAst::ExpressionType::Void; switch (builtin) { @@ -37,7 +37,7 @@ namespace Nz { namespace ShaderBuilder break; } - NazaraAssert(exprType != ShaderAst::ExpressionType::None, "Unhandled builtin"); + NazaraAssert(exprType != ShaderAst::ExpressionType::Void, "Unhandled builtin"); return std::make_shared(builtin, exprType); } diff --git a/src/Nazara/Renderer/GlslWriter.cpp b/src/Nazara/Renderer/GlslWriter.cpp index 3da5b011d..aea4b5667 100644 --- a/src/Nazara/Renderer/GlslWriter.cpp +++ b/src/Nazara/Renderer/GlslWriter.cpp @@ -39,7 +39,7 @@ namespace Nz Function entryPoint; entryPoint.name = "main"; //< GLSL has only one entry point name possible entryPoint.node = node; - entryPoint.retType = ShaderAst::ExpressionType::None; + entryPoint.retType = ShaderAst::ExpressionType::Void; AppendFunction(entryPoint); @@ -309,7 +309,7 @@ namespace Nz case ShaderAst::ExpressionType::Mat4x4: Append("mat4"); break; - case ShaderAst::ExpressionType::None: + case ShaderAst::ExpressionType::Void: Append("void"); break; } diff --git a/src/Nazara/Renderer/ShaderAst.cpp b/src/Nazara/Renderer/ShaderAst.cpp index a1612ebf9..08e2189f1 100644 --- a/src/Nazara/Renderer/ShaderAst.cpp +++ b/src/Nazara/Renderer/ShaderAst.cpp @@ -76,7 +76,7 @@ namespace Nz { namespace ShaderAst ExpressionType BinaryOp::GetExpressionType() const { - ShaderAst::ExpressionType exprType = ShaderAst::ExpressionType::None; + ShaderAst::ExpressionType exprType = ShaderAst::ExpressionType::Void; switch (op) { @@ -91,7 +91,7 @@ namespace Nz { namespace ShaderAst exprType = ExpressionType::Boolean; } - NazaraAssert(exprType != ShaderAst::ExpressionType::None, "Unhandled builtin"); + NazaraAssert(exprType != ShaderAst::ExpressionType::Void, "Unhandled builtin"); return exprType; }