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

Forgot to save all files..

This commit is contained in:
Lynix 2017-01-06 16:38:52 +01:00
parent 607bb9d3a0
commit 3557d0c9a8
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Renderer/ShaderBuilder.inl
View File

@ -28,7 +28,7 @@ namespace Nz { namespace ShaderBuilder
std::shared_ptr<ShaderAst::Variable> BuiltinBuilder::operator()(ShaderAst::BuiltinEntry builtin) const std::shared_ptr<ShaderAst::Variable> BuiltinBuilder::operator()(ShaderAst::BuiltinEntry builtin) const
{ {
ShaderAst::ExpressionType exprType = ShaderAst::ExpressionType::None; ShaderAst::ExpressionType exprType = ShaderAst::ExpressionType::Void;
switch (builtin) switch (builtin)
{ {
@ -37,7 +37,7 @@ namespace Nz { namespace ShaderBuilder
break; break;
} }
NazaraAssert(exprType != ShaderAst::ExpressionType::None, "Unhandled builtin"); NazaraAssert(exprType != ShaderAst::ExpressionType::Void, "Unhandled builtin");
return std::make_shared<ShaderAst::BuiltinVariable>(builtin, exprType); return std::make_shared<ShaderAst::BuiltinVariable>(builtin, exprType);
} }

4
src/Nazara/Renderer/GlslWriter.cpp
View File

@ -39,7 +39,7 @@ namespace Nz
Function entryPoint; Function entryPoint;
entryPoint.name = "main"; //< GLSL has only one entry point name possible entryPoint.name = "main"; //< GLSL has only one entry point name possible
entryPoint.node = node; entryPoint.node = node;
entryPoint.retType = ShaderAst::ExpressionType::None; entryPoint.retType = ShaderAst::ExpressionType::Void;
AppendFunction(entryPoint); AppendFunction(entryPoint);
@ -309,7 +309,7 @@ namespace Nz
case ShaderAst::ExpressionType::Mat4x4: case ShaderAst::ExpressionType::Mat4x4:
Append("mat4"); Append("mat4");
break; break;
case ShaderAst::ExpressionType::None: case ShaderAst::ExpressionType::Void:
Append("void"); Append("void");
break; break;
} }

4
src/Nazara/Renderer/ShaderAst.cpp
View File

@ -76,7 +76,7 @@ namespace Nz { namespace ShaderAst
ExpressionType BinaryOp::GetExpressionType() const ExpressionType BinaryOp::GetExpressionType() const
{ {
ShaderAst::ExpressionType exprType = ShaderAst::ExpressionType::None; ShaderAst::ExpressionType exprType = ShaderAst::ExpressionType::Void;
switch (op) switch (op)
{ {
@ -91,7 +91,7 @@ namespace Nz { namespace ShaderAst
exprType = ExpressionType::Boolean; exprType = ExpressionType::Boolean;
} }
NazaraAssert(exprType != ShaderAst::ExpressionType::None, "Unhandled builtin"); NazaraAssert(exprType != ShaderAst::ExpressionType::Void, "Unhandled builtin");
return exprType; return exprType;
} }