Adjust member access of the various visitors in the GLSL compiler

[libs/gl.git] / source / glsl / compatibility.cpp

diff --git a/source/glsl/compatibility.cpp b/source/glsl/compatibility.cpp
index 0c312d022ca20f71da5818863136614647e47fd7..1ada7b7c9acbd0f23fab28e868ca839621263b92 100644 (file)
--- a/source/glsl/compatibility.cpp
+++ b/source/glsl/compatibility.cpp
@@ -14,9 +14,16 @@ namespace GL {
 namespace SL {
 
 DefaultPrecisionGenerator::DefaultPrecisionGenerator():
+       stage_type(Stage::SHARED),
        toplevel(true)
 { }
 
+void DefaultPrecisionGenerator::apply(Stage &stage)
+{
+       SetForScope<Stage::Type> set_stage(stage_type, stage.type);
+       visit(stage.content);
+}
+
 void DefaultPrecisionGenerator::visit(Block &block)
 {
        if(toplevel)
@@ -25,7 +32,7 @@ void DefaultPrecisionGenerator::visit(Block &block)
                BlockModifier::visit(block);
        }
        else
-               StageVisitor::visit(block);
+               TraversingVisitor::visit(block);
 }
 
 void DefaultPrecisionGenerator::visit(Precision &prec)
@@ -49,7 +56,7 @@ void DefaultPrecisionGenerator::visit(VariableDeclaration &var)
                Precision *prec = new Precision;
                if(!type.compare(0, 7, "sampler"))
                        prec->precision = "lowp";
-               else if(stage->type==FRAGMENT)
+               else if(stage_type==Stage::FRAGMENT)
                        prec->precision = "mediump";
                else
                        prec->precision = "highp";
@@ -84,6 +91,12 @@ LegacyConverter::LegacyConverter(const Version &v):
        frag_out(0)
 { }
 
+void LegacyConverter::apply(Stage &s)
+{
+       SetForScope<Stage *> set_stage(stage, &s);
+       visit(s.content);
+}
+
 bool LegacyConverter::check_version(const Version &feature_version) const
 {
        if(target_version<feature_version)
@@ -145,47 +158,54 @@ bool LegacyConverter::supports_unified_sampling_functions() const
 
 void LegacyConverter::visit(FunctionCall &call)
 {
-       if(call.name=="texture" && !call.declaration && !supports_unified_sampling_functions())
+       if(call.name=="texture")
        {
+               string sampler_type;
+               type = string();
                NodeArray<Expression>::iterator i = call.arguments.begin();
                if(i!=call.arguments.end())
                {
                        (*i)->visit(*this);
-                       if(type=="sampler1D")
+                       sampler_type = type;
+
+                       for(; i!=call.arguments.end(); ++i)
+                               (*i)->visit(*this);
+               }
+
+               if(!supports_unified_sampling_functions())
+               {
+                       if(sampler_type=="sampler1D")
                                call.name = "texture1D";
-                       else if(type=="sampler2D")
+                       else if(sampler_type=="sampler2D")
                                call.name = "texture2D";
-                       else if(type=="sampler3D")
+                       else if(sampler_type=="sampler3D")
                                call.name = "texture3D";
-                       else if(type=="samplerCube")
+                       else if(sampler_type=="samplerCube")
                                call.name = "textureCube";
-                       else if(type=="sampler1DShadow")
+                       else if(sampler_type=="sampler1DShadow")
                                call.name = "shadow1D";
-                       else if(type=="sampler2DShadow")
+                       else if(sampler_type=="sampler2DShadow")
                                call.name = "shadow2D";
-                       else if(type=="sampler1DArray")
+                       else if(sampler_type=="sampler1DArray")
                        {
                                check_extension(EXT_texture_array);
                                call.name = "texture1DArray";
                        }
-                       else if(type=="sampler2DArray")
+                       else if(sampler_type=="sampler2DArray")
                        {
                                check_extension(EXT_texture_array);
                                call.name = "texture2DArray";
                        }
-                       else if(type=="sampler1DArrayShadow")
+                       else if(sampler_type=="sampler1DArrayShadow")
                        {
                                check_extension(EXT_texture_array);
                                call.name = "shadow1DArray";
                        }
-                       else if(type=="sampler2DArrayShadow")
+                       else if(sampler_type=="sampler2DArrayShadow")
                        {
                                check_extension(EXT_texture_array);
                                call.name = "shadow2DArray";
                        }
-
-                       for(; i!=call.arguments.end(); ++i)
-                               (*i)->visit(*this);
                }
        }
        else
@@ -231,12 +251,12 @@ void LegacyConverter::visit(VariableDeclaration &var)
                if(i!=var.layout->qualifiers.end())
                {
                        unsigned location = lexical_cast<unsigned>(i->value);
-                       if(stage->type==VERTEX && var.interface=="in")
+                       if(stage->type==Stage::VERTEX && var.interface=="in")
                        {
                                stage->locations[var.name] = location;
                                var.layout->qualifiers.erase(i);
                        }
-                       else if(stage->type==FRAGMENT && var.interface=="out")
+                       else if(stage->type==Stage::FRAGMENT && var.interface=="out")
                        {
                                if(location!=0)
                                        static Require _req(EXT_gpu_shader4);
@@ -262,7 +282,7 @@ void LegacyConverter::visit(VariableDeclaration &var)
 
        if((var.interface=="in" || var.interface=="out") && !supports_unified_interface_syntax())
        {
-               if(stage->type==FRAGMENT && var.interface=="out")
+               if(stage->type==Stage::FRAGMENT && var.interface=="out")
                {
                        frag_out = &var;
                        remove_node = true;