Do not clear previous assignments on assignment to array subscript

[libs/gl.git] / source / programbuilder.cpp

diff --git a/source/programbuilder.cpp b/source/programbuilder.cpp
index affc4cc30e2b26ca109e0c9d4eeebe72c430c407..247c249b380901623e1dfc02ac573966e445a89f 100644 (file)
--- a/source/programbuilder.cpp
+++ b/source/programbuilder.cpp
@@ -782,9 +782,9 @@ ProgramBuilder::StandardFeatures::StandardFeatures():
        geometry(false)
 {
        if(get_gl_api()==OPENGL_ES2)
-               legacy = !(get_glsl_version()>=Version(3, 0));
+               legacy = get_glsl_version()<Version(3, 0);
        else
-               legacy = !(get_glsl_version()>=Version(1, 30));
+               legacy = get_glsl_version()<Version(1, 30);
 }
 
 string ProgramBuilder::StandardFeatures::create_flags() const
@@ -893,7 +893,7 @@ void ProgramBuilder::ShaderVariable::resolve_space(const string &space)
                        (*i)->resolve_space(space);
 }
 
-void ProgramBuilder::ShaderVariable::resolve_array(const StandardFeatures &features, unsigned size_hint)
+void ProgramBuilder::ShaderVariable::resolve_array(const StandardFeatures &feat, unsigned size_hint)
 {
        if(array_size)
                return;
@@ -910,9 +910,9 @@ void ProgramBuilder::ShaderVariable::resolve_array(const StandardFeatures &featu
        if(variable && variable->scope==UNIFORM)
        {
                if(array_subscript=="MAX_LIGHTS")
-                       array_size = features.max_lights;
+                       array_size = feat.max_lights;
                else if(array_subscript=="MAX_CLIP_PLANES")
-                       array_size = features.max_clip_planes;
+                       array_size = feat.max_clip_planes;
                else if(isnumrc(array_subscript))
                        array_size = lexical_cast<unsigned>(array_subscript);
                else
@@ -936,7 +936,7 @@ void ProgramBuilder::ShaderVariable::resolve_array(const StandardFeatures &featu
        {
                for(list<ShaderVariable *>::const_iterator i=referenced_vars.begin(); i!=referenced_vars.end(); ++i)
                        if(!(*i)->array_subscript.empty() && !(*i)->array_size)
-                               (*i)->resolve_array(features, array_size);
+                               (*i)->resolve_array(feat, array_size);
        }
 }
 
@@ -1092,19 +1092,19 @@ string ProgramBuilder::ShaderVariable::create_declaration(char iface, bool loop)
                return format("%s %s%s", variable->type, resolved_name, array);
 }
 
-string ProgramBuilder::ShaderVariable::create_replacement(VariableScope from_scope, unsigned enabled_scopes, const char *loop) const
+string ProgramBuilder::ShaderVariable::create_replacement(VariableScope from_scope, unsigned scopes, const char *loop) const
 {
        string replacement = resolved_name;
        InterfaceFlags iface = NO_INTERFACE;
        if(variable)
        {
                iface = get_interface_flags(from_scope);
-               VariableScope prev_scope = previous_scope(from_scope, enabled_scopes);
+               VariableScope prev_scope = previous_scope(from_scope, scopes);
                if((iface&INPUT) && interfaces[prev_scope])
                        replacement = format("%c_%s", interfaces[prev_scope], replacement);
                else if(inlined)
                {
-                       replacement = create_expression(enabled_scopes, loop);
+                       replacement = create_expression(scopes, loop);
                        if(inline_parens)
                                replacement = "("+replacement+")";
                        return replacement;
@@ -1123,12 +1123,12 @@ string ProgramBuilder::ShaderVariable::create_replacement(VariableScope from_sco
        return replacement;
 }
 
-string ProgramBuilder::ShaderVariable::create_expression(unsigned enabled_scopes, const char *loop) const
+string ProgramBuilder::ShaderVariable::create_expression(unsigned scopes, const char *loop) const
 {
        map<string, string> replace_map;
        for(list<ShaderVariable *>::const_iterator i=referenced_vars.begin(); i!=referenced_vars.end(); ++i)
        {
-               string replacement = (*i)->create_replacement(variable->scope, enabled_scopes, loop);
+               string replacement = (*i)->create_replacement(variable->scope, scopes, loop);
                if(replacement!=(*i)->name)
                        replace_map[(*i)->name] = replacement;
        }