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

Renderer/ShaderAst: Rename Builtin enum to BuiltinEntry

This commit is contained in:
Lynix 2017-01-06 13:47:05 +01:00
parent a60836c45a
commit 8fd152aec0
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Renderer/GlslWriter.hpp
View File

@ -47,7 +47,7 @@ namespace Nz
struct Function; struct Function;
using VariableContainer = std::set<std::pair<ShaderAst::ExpressionType, String>>; using VariableContainer = std::set<std::pair<ShaderAst::ExpressionType, String>>;
void Append(ShaderAst::Builtin builtin); void Append(ShaderAst::BuiltinEntry builtin);
void Append(ShaderAst::ExpressionType type); void Append(ShaderAst::ExpressionType type);
void Append(const String& txt); void Append(const String& txt);
void AppendCommentSection(const String& section); void AppendCommentSection(const String& section);

6
include/Nazara/Renderer/ShaderAst.hpp
View File

@ -37,7 +37,7 @@ namespace Nz
Equality //< == Equality //< ==
}; };
enum class Builtin enum class BuiltinEntry
{ {
VertexPosition, // gl_Position VertexPosition, // gl_Position
}; };
@ -157,12 +157,12 @@ namespace Nz
class NAZARA_RENDERER_API BuiltinVariable : public Variable class NAZARA_RENDERER_API BuiltinVariable : public Variable
{ {
public: public:
inline BuiltinVariable(Builtin variable, ExpressionType varType); inline BuiltinVariable(BuiltinEntry variable, ExpressionType varType);
void Register(ShaderWriter& visitor) override; void Register(ShaderWriter& visitor) override;
void Visit(ShaderWriter& visitor) override; void Visit(ShaderWriter& visitor) override;
Builtin var; BuiltinEntry var;
}; };
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////

2
include/Nazara/Renderer/ShaderAst.inl
View File

@ -69,7 +69,7 @@ namespace Nz
{ {
} }
inline BuiltinVariable::BuiltinVariable(Builtin variable, ExpressionType varType) : inline BuiltinVariable::BuiltinVariable(BuiltinEntry variable, ExpressionType varType) :
Variable(VariableType::Builtin, varType), Variable(VariableType::Builtin, varType),
var(variable) var(variable)
{ {

2
include/Nazara/Renderer/ShaderBuilder.hpp
View File

@ -27,7 +27,7 @@ namespace Nz { namespace ShaderBuilder
struct BuiltinBuilder struct BuiltinBuilder
{ {
std::shared_ptr<ShaderAst::Variable> operator()(ShaderAst::Builtin builtin) const; std::shared_ptr<ShaderAst::Variable> operator()(ShaderAst::BuiltinEntry builtin) const;
}; };
template<typename T> template<typename T>

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

@ -26,13 +26,13 @@ namespace Nz { namespace ShaderBuilder
return std::make_shared<ShaderAst::BinaryOp>(op, left, right); return std::make_shared<ShaderAst::BinaryOp>(op, left, right);
} }
std::shared_ptr<ShaderAst::Variable> BuiltinBuilder::operator()(ShaderAst::Builtin builtin) const std::shared_ptr<ShaderAst::Variable> BuiltinBuilder::operator()(ShaderAst::BuiltinEntry builtin) const
{ {
ShaderAst::ExpressionType exprType = ShaderAst::ExpressionType::None; ShaderAst::ExpressionType exprType = ShaderAst::ExpressionType::None;
switch (builtin) switch (builtin)
{ {
case ShaderAst::Builtin::VertexPosition: case ShaderAst::BuiltinEntry::VertexPosition:
exprType = ShaderAst::ExpressionType::Float4; exprType = ShaderAst::ExpressionType::Float4;
break; break;
} }

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

@ -274,11 +274,11 @@ namespace Nz
} }
} }
void GlslWriter::Append(ShaderAst::Builtin builtin) void GlslWriter::Append(ShaderAst::BuiltinEntry builtin)
{ {
switch (builtin) switch (builtin)
{ {
case ShaderAst::Builtin::VertexPosition: case ShaderAst::BuiltinEntry::VertexPosition:
Append("gl_Position"); Append("gl_Position");
break; break;
} }