diff --git a/src/Nazara/Shader/Ast/AstOptimizer.cpp b/src/Nazara/Shader/Ast/AstOptimizer.cpp index c58ee0f66..d178ff423 100644 --- a/src/Nazara/Shader/Ast/AstOptimizer.cpp +++ b/src/Nazara/Shader/Ast/AstOptimizer.cpp @@ -317,24 +317,24 @@ namespace Nz::ShaderAst EnableOptimisation(BinaryCompEq, bool, bool); EnableOptimisation(BinaryCompEq, double, double); EnableOptimisation(BinaryCompEq, float, float); - EnableOptimisation(BinaryCompEq, Nz::Int32, Nz::Int32); - EnableOptimisation(BinaryCompEq, Nz::Vector2f, Nz::Vector2f); - EnableOptimisation(BinaryCompEq, Nz::Vector3f, Nz::Vector3f); - EnableOptimisation(BinaryCompEq, Nz::Vector4f, Nz::Vector4f); - EnableOptimisation(BinaryCompEq, Nz::Vector2i32, Nz::Vector2i32); - EnableOptimisation(BinaryCompEq, Nz::Vector3i32, Nz::Vector3i32); - EnableOptimisation(BinaryCompEq, Nz::Vector4i32, Nz::Vector4i32); + EnableOptimisation(BinaryCompEq, Int32, Int32); + EnableOptimisation(BinaryCompEq, Vector2f, Vector2f); + EnableOptimisation(BinaryCompEq, Vector3f, Vector3f); + EnableOptimisation(BinaryCompEq, Vector4f, Vector4f); + EnableOptimisation(BinaryCompEq, Vector2i32, Vector2i32); + EnableOptimisation(BinaryCompEq, Vector3i32, Vector3i32); + EnableOptimisation(BinaryCompEq, Vector4i32, Vector4i32); EnableOptimisation(BinaryCompGe, bool, bool); EnableOptimisation(BinaryCompGe, double, double); EnableOptimisation(BinaryCompGe, float, float); - EnableOptimisation(BinaryCompGe, Nz::Int32, Nz::Int32); - EnableOptimisation(BinaryCompGe, Nz::Vector2f, Nz::Vector2f); - EnableOptimisation(BinaryCompGe, Nz::Vector3f, Nz::Vector3f); - EnableOptimisation(BinaryCompGe, Nz::Vector4f, Nz::Vector4f); - EnableOptimisation(BinaryCompGe, Nz::Vector2i32, Nz::Vector2i32); - EnableOptimisation(BinaryCompGe, Nz::Vector3i32, Nz::Vector3i32); - EnableOptimisation(BinaryCompGe, Nz::Vector4i32, Nz::Vector4i32); + EnableOptimisation(BinaryCompGe, Int32, Int32); + EnableOptimisation(BinaryCompGe, Vector2f, Vector2f); + EnableOptimisation(BinaryCompGe, Vector3f, Vector3f); + EnableOptimisation(BinaryCompGe, Vector4f, Vector4f); + EnableOptimisation(BinaryCompGe, Vector2i32, Vector2i32); + EnableOptimisation(BinaryCompGe, Vector3i32, Vector3i32); + EnableOptimisation(BinaryCompGe, Vector4i32, Vector4i32); EnableOptimisation(BinaryCompGt, bool, bool); EnableOptimisation(BinaryCompGt, double, double); @@ -350,117 +350,117 @@ namespace Nz::ShaderAst EnableOptimisation(BinaryCompLe, bool, bool); EnableOptimisation(BinaryCompLe, double, double); EnableOptimisation(BinaryCompLe, float, float); - EnableOptimisation(BinaryCompLe, Nz::Int32, Nz::Int32); - EnableOptimisation(BinaryCompLe, Nz::Vector2f, Nz::Vector2f); - EnableOptimisation(BinaryCompLe, Nz::Vector3f, Nz::Vector3f); - EnableOptimisation(BinaryCompLe, Nz::Vector4f, Nz::Vector4f); - EnableOptimisation(BinaryCompLe, Nz::Vector2i32, Nz::Vector2i32); - EnableOptimisation(BinaryCompLe, Nz::Vector3i32, Nz::Vector3i32); - EnableOptimisation(BinaryCompLe, Nz::Vector4i32, Nz::Vector4i32); + EnableOptimisation(BinaryCompLe, Int32, Int32); + EnableOptimisation(BinaryCompLe, Vector2f, Vector2f); + EnableOptimisation(BinaryCompLe, Vector3f, Vector3f); + EnableOptimisation(BinaryCompLe, Vector4f, Vector4f); + EnableOptimisation(BinaryCompLe, Vector2i32, Vector2i32); + EnableOptimisation(BinaryCompLe, Vector3i32, Vector3i32); + EnableOptimisation(BinaryCompLe, Vector4i32, Vector4i32); EnableOptimisation(BinaryCompLt, bool, bool); EnableOptimisation(BinaryCompLt, double, double); EnableOptimisation(BinaryCompLt, float, float); - EnableOptimisation(BinaryCompLt, Nz::Int32, Nz::Int32); - EnableOptimisation(BinaryCompLt, Nz::Vector2f, Nz::Vector2f); - EnableOptimisation(BinaryCompLt, Nz::Vector3f, Nz::Vector3f); - EnableOptimisation(BinaryCompLt, Nz::Vector4f, Nz::Vector4f); - EnableOptimisation(BinaryCompLt, Nz::Vector2i32, Nz::Vector2i32); - EnableOptimisation(BinaryCompLt, Nz::Vector3i32, Nz::Vector3i32); - EnableOptimisation(BinaryCompLt, Nz::Vector4i32, Nz::Vector4i32); + EnableOptimisation(BinaryCompLt, Int32, Int32); + EnableOptimisation(BinaryCompLt, Vector2f, Vector2f); + EnableOptimisation(BinaryCompLt, Vector3f, Vector3f); + EnableOptimisation(BinaryCompLt, Vector4f, Vector4f); + EnableOptimisation(BinaryCompLt, Vector2i32, Vector2i32); + EnableOptimisation(BinaryCompLt, Vector3i32, Vector3i32); + EnableOptimisation(BinaryCompLt, Vector4i32, Vector4i32); EnableOptimisation(BinaryCompNe, bool, bool); EnableOptimisation(BinaryCompNe, double, double); EnableOptimisation(BinaryCompNe, float, float); - EnableOptimisation(BinaryCompNe, Nz::Int32, Nz::Int32); - EnableOptimisation(BinaryCompNe, Nz::Vector2f, Nz::Vector2f); - EnableOptimisation(BinaryCompNe, Nz::Vector3f, Nz::Vector3f); - EnableOptimisation(BinaryCompNe, Nz::Vector4f, Nz::Vector4f); - EnableOptimisation(BinaryCompNe, Nz::Vector2i32, Nz::Vector2i32); - EnableOptimisation(BinaryCompNe, Nz::Vector3i32, Nz::Vector3i32); - EnableOptimisation(BinaryCompNe, Nz::Vector4i32, Nz::Vector4i32); + EnableOptimisation(BinaryCompNe, Int32, Int32); + EnableOptimisation(BinaryCompNe, Vector2f, Vector2f); + EnableOptimisation(BinaryCompNe, Vector3f, Vector3f); + EnableOptimisation(BinaryCompNe, Vector4f, Vector4f); + EnableOptimisation(BinaryCompNe, Vector2i32, Vector2i32); + EnableOptimisation(BinaryCompNe, Vector3i32, Vector3i32); + EnableOptimisation(BinaryCompNe, Vector4i32, Vector4i32); EnableOptimisation(BinaryAddition, double, double); EnableOptimisation(BinaryAddition, float, float); - EnableOptimisation(BinaryAddition, Nz::Int32, Nz::Int32); - EnableOptimisation(BinaryAddition, Nz::Vector2f, Nz::Vector2f); - EnableOptimisation(BinaryAddition, Nz::Vector3f, Nz::Vector3f); - EnableOptimisation(BinaryAddition, Nz::Vector4f, Nz::Vector4f); - EnableOptimisation(BinaryAddition, Nz::Vector2i32, Nz::Vector2i32); - EnableOptimisation(BinaryAddition, Nz::Vector3i32, Nz::Vector3i32); - EnableOptimisation(BinaryAddition, Nz::Vector4i32, Nz::Vector4i32); + EnableOptimisation(BinaryAddition, Int32, Int32); + EnableOptimisation(BinaryAddition, Vector2f, Vector2f); + EnableOptimisation(BinaryAddition, Vector3f, Vector3f); + EnableOptimisation(BinaryAddition, Vector4f, Vector4f); + EnableOptimisation(BinaryAddition, Vector2i32, Vector2i32); + EnableOptimisation(BinaryAddition, Vector3i32, Vector3i32); + EnableOptimisation(BinaryAddition, Vector4i32, Vector4i32); EnableOptimisation(BinaryDivision, double, double); - EnableOptimisation(BinaryDivision, double, Nz::Vector2d); - EnableOptimisation(BinaryDivision, double, Nz::Vector3d); - EnableOptimisation(BinaryDivision, double, Nz::Vector4d); + EnableOptimisation(BinaryDivision, double, Vector2d); + EnableOptimisation(BinaryDivision, double, Vector3d); + EnableOptimisation(BinaryDivision, double, Vector4d); EnableOptimisation(BinaryDivision, float, float); - EnableOptimisation(BinaryDivision, float, Nz::Vector2f); - EnableOptimisation(BinaryDivision, float, Nz::Vector3f); - EnableOptimisation(BinaryDivision, float, Nz::Vector4f); - EnableOptimisation(BinaryDivision, Nz::Int32, Nz::Int32); - EnableOptimisation(BinaryDivision, Nz::Int32, Nz::Vector2i32); - EnableOptimisation(BinaryDivision, Nz::Int32, Nz::Vector3i32); - EnableOptimisation(BinaryDivision, Nz::Int32, Nz::Vector4i32); - EnableOptimisation(BinaryDivision, Nz::Vector2f, float); - EnableOptimisation(BinaryDivision, Nz::Vector2f, Nz::Vector2f); - EnableOptimisation(BinaryDivision, Nz::Vector3f, float); - EnableOptimisation(BinaryDivision, Nz::Vector3f, Nz::Vector3f); - EnableOptimisation(BinaryDivision, Nz::Vector4f, float); - EnableOptimisation(BinaryDivision, Nz::Vector4f, Nz::Vector4f); - EnableOptimisation(BinaryDivision, Nz::Vector2d, double); - EnableOptimisation(BinaryDivision, Nz::Vector2d, Nz::Vector2d); - EnableOptimisation(BinaryDivision, Nz::Vector3d, double); - EnableOptimisation(BinaryDivision, Nz::Vector3d, Nz::Vector3d); - EnableOptimisation(BinaryDivision, Nz::Vector4d, double); - EnableOptimisation(BinaryDivision, Nz::Vector4d, Nz::Vector4d); - EnableOptimisation(BinaryDivision, Nz::Vector2i32, Nz::Int32); - EnableOptimisation(BinaryDivision, Nz::Vector2i32, Nz::Vector2i32); - EnableOptimisation(BinaryDivision, Nz::Vector3i32, Nz::Int32); - EnableOptimisation(BinaryDivision, Nz::Vector3i32, Nz::Vector3i32); - EnableOptimisation(BinaryDivision, Nz::Vector4i32, Nz::Int32); - EnableOptimisation(BinaryDivision, Nz::Vector4i32, Nz::Vector4i32); + EnableOptimisation(BinaryDivision, float, Vector2f); + EnableOptimisation(BinaryDivision, float, Vector3f); + EnableOptimisation(BinaryDivision, float, Vector4f); + EnableOptimisation(BinaryDivision, Int32, Int32); + EnableOptimisation(BinaryDivision, Int32, Vector2i32); + EnableOptimisation(BinaryDivision, Int32, Vector3i32); + EnableOptimisation(BinaryDivision, Int32, Vector4i32); + EnableOptimisation(BinaryDivision, Vector2f, float); + EnableOptimisation(BinaryDivision, Vector2f, Vector2f); + EnableOptimisation(BinaryDivision, Vector3f, float); + EnableOptimisation(BinaryDivision, Vector3f, Vector3f); + EnableOptimisation(BinaryDivision, Vector4f, float); + EnableOptimisation(BinaryDivision, Vector4f, Vector4f); + EnableOptimisation(BinaryDivision, Vector2d, double); + EnableOptimisation(BinaryDivision, Vector2d, Vector2d); + EnableOptimisation(BinaryDivision, Vector3d, double); + EnableOptimisation(BinaryDivision, Vector3d, Vector3d); + EnableOptimisation(BinaryDivision, Vector4d, double); + EnableOptimisation(BinaryDivision, Vector4d, Vector4d); + EnableOptimisation(BinaryDivision, Vector2i32, Int32); + EnableOptimisation(BinaryDivision, Vector2i32, Vector2i32); + EnableOptimisation(BinaryDivision, Vector3i32, Int32); + EnableOptimisation(BinaryDivision, Vector3i32, Vector3i32); + EnableOptimisation(BinaryDivision, Vector4i32, Int32); + EnableOptimisation(BinaryDivision, Vector4i32, Vector4i32); EnableOptimisation(BinaryMultiplication, double, double); - EnableOptimisation(BinaryMultiplication, double, Nz::Vector2d); - EnableOptimisation(BinaryMultiplication, double, Nz::Vector3d); - EnableOptimisation(BinaryMultiplication, double, Nz::Vector4d); + EnableOptimisation(BinaryMultiplication, double, Vector2d); + EnableOptimisation(BinaryMultiplication, double, Vector3d); + EnableOptimisation(BinaryMultiplication, double, Vector4d); EnableOptimisation(BinaryMultiplication, float, float); - EnableOptimisation(BinaryMultiplication, float, Nz::Vector2f); - EnableOptimisation(BinaryMultiplication, float, Nz::Vector3f); - EnableOptimisation(BinaryMultiplication, float, Nz::Vector4f); - EnableOptimisation(BinaryMultiplication, Nz::Int32, Nz::Int32); - EnableOptimisation(BinaryMultiplication, Nz::Int32, Nz::Vector2i32); - EnableOptimisation(BinaryMultiplication, Nz::Int32, Nz::Vector3i32); - EnableOptimisation(BinaryMultiplication, Nz::Int32, Nz::Vector4i32); - EnableOptimisation(BinaryMultiplication, Nz::Vector2f, float); - EnableOptimisation(BinaryMultiplication, Nz::Vector2f, Nz::Vector2f); - EnableOptimisation(BinaryMultiplication, Nz::Vector3f, float); - EnableOptimisation(BinaryMultiplication, Nz::Vector3f, Nz::Vector3f); - EnableOptimisation(BinaryMultiplication, Nz::Vector4f, float); - EnableOptimisation(BinaryMultiplication, Nz::Vector4f, Nz::Vector4f); - EnableOptimisation(BinaryMultiplication, Nz::Vector2d, double); - EnableOptimisation(BinaryMultiplication, Nz::Vector2d, Nz::Vector2d); - EnableOptimisation(BinaryMultiplication, Nz::Vector3d, double); - EnableOptimisation(BinaryMultiplication, Nz::Vector3d, Nz::Vector3d); - EnableOptimisation(BinaryMultiplication, Nz::Vector4d, double); - EnableOptimisation(BinaryMultiplication, Nz::Vector4d, Nz::Vector4d); - EnableOptimisation(BinaryMultiplication, Nz::Vector2i32, Nz::Int32); - EnableOptimisation(BinaryMultiplication, Nz::Vector2i32, Nz::Vector2i32); - EnableOptimisation(BinaryMultiplication, Nz::Vector3i32, Nz::Int32); - EnableOptimisation(BinaryMultiplication, Nz::Vector3i32, Nz::Vector3i32); - EnableOptimisation(BinaryMultiplication, Nz::Vector4i32, Nz::Int32); - EnableOptimisation(BinaryMultiplication, Nz::Vector4i32, Nz::Vector4i32); + EnableOptimisation(BinaryMultiplication, float, Vector2f); + EnableOptimisation(BinaryMultiplication, float, Vector3f); + EnableOptimisation(BinaryMultiplication, float, Vector4f); + EnableOptimisation(BinaryMultiplication, Int32, Int32); + EnableOptimisation(BinaryMultiplication, Int32, Vector2i32); + EnableOptimisation(BinaryMultiplication, Int32, Vector3i32); + EnableOptimisation(BinaryMultiplication, Int32, Vector4i32); + EnableOptimisation(BinaryMultiplication, Vector2f, float); + EnableOptimisation(BinaryMultiplication, Vector2f, Vector2f); + EnableOptimisation(BinaryMultiplication, Vector3f, float); + EnableOptimisation(BinaryMultiplication, Vector3f, Vector3f); + EnableOptimisation(BinaryMultiplication, Vector4f, float); + EnableOptimisation(BinaryMultiplication, Vector4f, Vector4f); + EnableOptimisation(BinaryMultiplication, Vector2d, double); + EnableOptimisation(BinaryMultiplication, Vector2d, Vector2d); + EnableOptimisation(BinaryMultiplication, Vector3d, double); + EnableOptimisation(BinaryMultiplication, Vector3d, Vector3d); + EnableOptimisation(BinaryMultiplication, Vector4d, double); + EnableOptimisation(BinaryMultiplication, Vector4d, Vector4d); + EnableOptimisation(BinaryMultiplication, Vector2i32, Int32); + EnableOptimisation(BinaryMultiplication, Vector2i32, Vector2i32); + EnableOptimisation(BinaryMultiplication, Vector3i32, Int32); + EnableOptimisation(BinaryMultiplication, Vector3i32, Vector3i32); + EnableOptimisation(BinaryMultiplication, Vector4i32, Int32); + EnableOptimisation(BinaryMultiplication, Vector4i32, Vector4i32); EnableOptimisation(BinarySubtraction, double, double); EnableOptimisation(BinarySubtraction, float, float); - EnableOptimisation(BinarySubtraction, Nz::Int32, Nz::Int32); - EnableOptimisation(BinarySubtraction, Nz::Vector2f, Nz::Vector2f); - EnableOptimisation(BinarySubtraction, Nz::Vector3f, Nz::Vector3f); - EnableOptimisation(BinarySubtraction, Nz::Vector4f, Nz::Vector4f); - EnableOptimisation(BinarySubtraction, Nz::Vector2i32, Nz::Vector2i32); - EnableOptimisation(BinarySubtraction, Nz::Vector3i32, Nz::Vector3i32); - EnableOptimisation(BinarySubtraction, Nz::Vector4i32, Nz::Vector4i32); + EnableOptimisation(BinarySubtraction, Int32, Int32); + EnableOptimisation(BinarySubtraction, Vector2f, Vector2f); + EnableOptimisation(BinarySubtraction, Vector3f, Vector3f); + EnableOptimisation(BinarySubtraction, Vector4f, Vector4f); + EnableOptimisation(BinarySubtraction, Vector2i32, Vector2i32); + EnableOptimisation(BinarySubtraction, Vector3i32, Vector3i32); + EnableOptimisation(BinarySubtraction, Vector4i32, Vector4i32); // Cast @@ -510,23 +510,23 @@ namespace Nz::ShaderAst EnableOptimisation(UnaryMinus, double); EnableOptimisation(UnaryMinus, float); - EnableOptimisation(UnaryMinus, Nz::Int32); - EnableOptimisation(UnaryMinus, Nz::Vector2f); - EnableOptimisation(UnaryMinus, Nz::Vector3f); - EnableOptimisation(UnaryMinus, Nz::Vector4f); - EnableOptimisation(UnaryMinus, Nz::Vector2i32); - EnableOptimisation(UnaryMinus, Nz::Vector3i32); - EnableOptimisation(UnaryMinus, Nz::Vector4i32); + EnableOptimisation(UnaryMinus, Int32); + EnableOptimisation(UnaryMinus, Vector2f); + EnableOptimisation(UnaryMinus, Vector3f); + EnableOptimisation(UnaryMinus, Vector4f); + EnableOptimisation(UnaryMinus, Vector2i32); + EnableOptimisation(UnaryMinus, Vector3i32); + EnableOptimisation(UnaryMinus, Vector4i32); EnableOptimisation(UnaryPlus, double); EnableOptimisation(UnaryPlus, float); - EnableOptimisation(UnaryPlus, Nz::Int32); - EnableOptimisation(UnaryPlus, Nz::Vector2f); - EnableOptimisation(UnaryPlus, Nz::Vector3f); - EnableOptimisation(UnaryPlus, Nz::Vector4f); - EnableOptimisation(UnaryPlus, Nz::Vector2i32); - EnableOptimisation(UnaryPlus, Nz::Vector3i32); - EnableOptimisation(UnaryPlus, Nz::Vector4i32); + EnableOptimisation(UnaryPlus, Int32); + EnableOptimisation(UnaryPlus, Vector2f); + EnableOptimisation(UnaryPlus, Vector3f); + EnableOptimisation(UnaryPlus, Vector4f); + EnableOptimisation(UnaryPlus, Vector2i32); + EnableOptimisation(UnaryPlus, Vector3i32); + EnableOptimisation(UnaryPlus, Vector4i32); #undef EnableOptimisation }