Improve legacy mode logic in ProgramBuilder

diff --git a/source/programbuilder.cpp b/source/programbuilder.cpp
index a2d49ac83c7ba6cb247f6a0a7df7808883b96da5..dc4bd19cacce0f146436bee57420946f6200321b 100644 (file)
--- a/source/programbuilder.cpp
+++ b/source/programbuilder.cpp
@@ -44,7 +44,7 @@ Naming conventions:
 anything that might need them. */
 const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] =
 {
-       { FRAGMENT, "gl_FragColor", "vec4", "frag_color", "g" },
+       { FRAGMENT, "gl_FragColor", "vec4", "frag_color", 0 },
        { FRAGMENT, "frag_color", "vec4", "basic_color", "!e!l" },
        { FRAGMENT, "frag_color", "vec4", "vec4(rgb_surface, surface_alpha)", "!el" },
        { FRAGMENT, "frag_color", "vec4", "vec4(rgb_surface+rgb_reflection, surface_alpha)", "e" },
@@ -236,7 +236,7 @@ ProgramBuilder::ProgramBuilder(const StandardFeatures &f):
                }
        }
 
-       if((get_gl_api()==OPENGL && !features.legacy) || (get_gl_api()==OPENGL_ES2 && get_glsl_version()>=Version(3, 0)))
+       if(!features.legacy)
        {
                aliases["texture2D"] = "texture";
                aliases["shadow2D"] = "texture";
@@ -345,8 +345,9 @@ void ProgramBuilder::add_shaders(Program &prog) const
        for(list<ShaderVariable>::iterator i=variables.end(); i!=variables.begin(); )
                (--i)->resolve_array(features);
 
+       bool legacy_variables = evaluate_flags("g");
        for(list<ShaderVariable *>::const_iterator i=resolved_vars.begin(); i!=resolved_vars.end(); ++i)
-               (*i)->check_inline(features.legacy, !optimize);
+               (*i)->check_inline(legacy_variables, !optimize);
 
        prog.attach_shader_owned(new VertexShader(create_source(resolved_vars, VERTEX)));
        prog.attach_shader_owned(new FragmentShader(create_source(resolved_vars, FRAGMENT)));
@@ -376,7 +377,6 @@ string ProgramBuilder::create_source(const list<ShaderVariable *> &variables, Va
 {
        string source;
 
-       bool legacy_qualifiers = features.legacy || (get_gl_api()==OPENGL_ES2 && !(get_glsl_version()>=Version(3, 0)));
        bool use_blocks = !features.legacy && ARB_uniform_buffer_object;
 
        if(!features.legacy)
@@ -431,13 +431,13 @@ string ProgramBuilder::create_source(const list<ShaderVariable *> &variables, Va
 
                if(iface&INPUT)
                {
-                       const char *qualifier = (legacy_qualifiers ? scope==VERTEX ? "attribute" : "varying" : "in");
+                       const char *qualifier = (features.legacy ? scope==VERTEX ? "attribute" : "varying" : "in");
                        source += format("%s %s;\n", qualifier, (*i)->create_declaration(interfaces[scope-1]));
                }
 
                if(iface&OUTPUT)
                {
-                       const char *qualifier = (legacy_qualifiers ? "varying" : "out");
+                       const char *qualifier = (features.legacy ? "varying" : "out");
                        source += format("%s %s;\n", qualifier, (*i)->create_declaration(interfaces[scope]));
                }
        }
@@ -718,9 +718,13 @@ ProgramBuilder::StandardFeatures::StandardFeatures():
        specular(false),
        normalmap(false),
        shadow(false),
-       reflection(false),
-       legacy(get_gl_api()==OPENGL && !(get_glsl_version()>=Version(1, 30)))
-{ }
+       reflection(false)
+{
+       if(get_gl_api()==OPENGL_ES2)
+               legacy = !(get_glsl_version()>=Version(3, 0));
+       else
+               legacy = !(get_glsl_version()>=Version(1, 30));
+}
 
 string ProgramBuilder::StandardFeatures::create_flags() const
 {
@@ -743,7 +747,7 @@ string ProgramBuilder::StandardFeatures::create_flags() const
                flags += 's';
        if(reflection)
                flags += 'e';
-       if(legacy)
+       if(legacy && get_gl_api()==OPENGL)
                flags += 'g';
 
        return flags;