Use texture() instead of texture2D() in non-legacy mode

Because the name of the diffuse texture uniform was changed to avoid
conflicting with the function, some changes in applications may be
necessary.

diff --git a/demos/desertpillars.cpp b/demos/desertpillars.cpp
index b5cdde063b7b62b674177f71694abe0a3b52a73b..be197828a6ed97c53326e9449867d233010af956 100644 (file)
--- a/demos/desertpillars.cpp
+++ b/demos/desertpillars.cpp
@@ -234,7 +234,7 @@ const char DesertPillars::ground_variables[] =
        "uniform sampler2D texture2;\n"
        "uniform sampler2D normalmap2;\n"
        "attribute float ground_type;\n"
        "uniform sampler2D texture2;\n"
        "uniform sampler2D normalmap2;\n"
        "attribute float ground_type;\n"

-       "fragment vec4 tex_sample = mix(texture2D(texture1, texture_coord*3.0), texture2D(texture2, texture_coord), ground_type);\n"
+       "fragment vec4 diffuse_sample = mix(texture2D(texture1, texture_coord*3.0), texture2D(texture2, texture_coord), ground_type);\n"

        "fragment vec3 normal_sample = mix(texture2D(normalmap1, texture_coord*3.0).rgb, texture2D(normalmap2, texture_coord).rgb, ground_type);\n";
 
 const char DesertPillars::cube_variables[] =
        "fragment vec3 normal_sample = mix(texture2D(normalmap1, texture_coord*3.0).rgb, texture2D(normalmap2, texture_coord).rgb, ground_type);\n";
 
 const char DesertPillars::cube_variables[] =

diff --git a/source/programbuilder.cpp b/source/programbuilder.cpp
index d8fe22ed14542fe8ce93fe670daeed566f122448..8215220081fd2cb6a32a543877bd208e3823fc7f 100644 (file)
--- a/source/programbuilder.cpp
+++ b/source/programbuilder.cpp
@@ -59,21 +59,21 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] =
        { FRAGMENT, "rgb_unlit_surface", "vec3", "basic_color.rgb", "!s" },
        { FRAGMENT, "rgb_unlit_surface", "vec3", "basic_color.rgb*l_shadow", "s" },
        { FRAGMENT, "rgb_lit_surface", "vec3", "rgb_illumination_diffuse", "!m!t" },
        { FRAGMENT, "rgb_unlit_surface", "vec3", "basic_color.rgb", "!s" },
        { FRAGMENT, "rgb_unlit_surface", "vec3", "basic_color.rgb*l_shadow", "s" },
        { FRAGMENT, "rgb_lit_surface", "vec3", "rgb_illumination_diffuse", "!m!t" },

-       { FRAGMENT, "rgb_lit_surface", "vec3", "rgb_illumination_diffuse*tex_sample.rgb", "!mt" },
+       { FRAGMENT, "rgb_lit_surface", "vec3", "rgb_illumination_diffuse*diffuse_sample.rgb", "!mt" },

        { FRAGMENT, "rgb_lit_surface", "vec3", "rgb_surface_ambient+rgb_surface_diffuse", "m!p" },
        { FRAGMENT, "rgb_lit_surface", "vec3", "rgb_surface_ambient+rgb_surface_diffuse+rgb_surface_specular", "mp" },
 
        { FRAGMENT, "surface_alpha", "float", "basic_color.a", "!m" },
        { FRAGMENT, "surface_alpha", "float", "basic_color.a", "m!l" },
        { FRAGMENT, "surface_alpha", "float", "material.diffuse.a", "ml!t" },
        { FRAGMENT, "rgb_lit_surface", "vec3", "rgb_surface_ambient+rgb_surface_diffuse", "m!p" },
        { FRAGMENT, "rgb_lit_surface", "vec3", "rgb_surface_ambient+rgb_surface_diffuse+rgb_surface_specular", "mp" },
 
        { FRAGMENT, "surface_alpha", "float", "basic_color.a", "!m" },
        { FRAGMENT, "surface_alpha", "float", "basic_color.a", "m!l" },
        { FRAGMENT, "surface_alpha", "float", "material.diffuse.a", "ml!t" },

-       { FRAGMENT, "surface_alpha", "float", "material.diffuse.a*tex_sample.a", "mlt" },
+       { FRAGMENT, "surface_alpha", "float", "material.diffuse.a*diffuse_sample.a", "mlt" },

        { FRAGMENT, "basic_color", "vec4", "vec4(1.0)", "!m!t" },
        { FRAGMENT, "basic_color", "vec4", "vec4(1.0)", "!m!t" },

-       { FRAGMENT, "basic_color", "vec4", "tex_sample", "!mt" },
+       { FRAGMENT, "basic_color", "vec4", "diffuse_sample", "!mt" },

        { FRAGMENT, "basic_color", "vec4", "color", "m!t" },
        { FRAGMENT, "basic_color", "vec4", "color", "m!t" },

-       { FRAGMENT, "basic_color", "vec4", "color*tex_sample", "mt" },
+       { FRAGMENT, "basic_color", "vec4", "color*diffuse_sample", "mt" },

 
        { FRAGMENT, "rgb_surface_ambient", "vec3", "rgb_illumination_ambient*material.ambient.rgb", "!t" },
 
        { FRAGMENT, "rgb_surface_ambient", "vec3", "rgb_illumination_ambient*material.ambient.rgb", "!t" },

-       { FRAGMENT, "rgb_surface_ambient", "vec3", "rgb_illumination_ambient*material.ambient.rgb*tex_sample.rgb", "t" },
+       { FRAGMENT, "rgb_surface_ambient", "vec3", "rgb_illumination_ambient*material.ambient.rgb*diffuse_sample.rgb", "t" },

        { FRAGMENT, "rgb_illumination_ambient", "vec3", "ambient_color.rgb", "!y" },
        { FRAGMENT, "rgb_illumination_ambient", "vec3", "ambient_color.rgb+l_skylight*sky_color.rgb", "y" },
        { FRAGMENT, "l_skylight", "float", "dot(n_zzz_normal, zzz_sky_dir)*0.5+0.5", 0 },
        { FRAGMENT, "rgb_illumination_ambient", "vec3", "ambient_color.rgb", "!y" },
        { FRAGMENT, "rgb_illumination_ambient", "vec3", "ambient_color.rgb+l_skylight*sky_color.rgb", "y" },
        { FRAGMENT, "l_skylight", "float", "dot(n_zzz_normal, zzz_sky_dir)*0.5+0.5", 0 },


@@ -88,7 +88,7 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] =
        { FRAGMENT, "l_specular[i]", "float", "pow(max(dot(n_zzz_half_vec[i], n_zzz_normal), 0.0), material.shininess)", 0 },
 
        { FRAGMENT, "rgb_surface_diffuse", "vec3", "rgb_illumination_diffuse*material.diffuse.rgb", "!t" },
        { FRAGMENT, "l_specular[i]", "float", "pow(max(dot(n_zzz_half_vec[i], n_zzz_normal), 0.0), material.shininess)", 0 },
 
        { FRAGMENT, "rgb_surface_diffuse", "vec3", "rgb_illumination_diffuse*material.diffuse.rgb", "!t" },

-       { FRAGMENT, "rgb_surface_diffuse", "vec3", "rgb_illumination_diffuse*material.diffuse.rgb*tex_sample.rgb", "t" },
+       { FRAGMENT, "rgb_surface_diffuse", "vec3", "rgb_illumination_diffuse*material.diffuse.rgb*diffuse_sample.rgb", "t" },

        { FRAGMENT, "rgb_illumination_diffuse", "vec3", "rgb_light_diffuse", "!s" },
        { FRAGMENT, "rgb_illumination_diffuse", "vec3", "rgb_light_diffuse*l_shadow", "s" },
        { FRAGMENT, "rgb_light_diffuse[i]", "vec3", "l_diffuse[i]*light_sources[i].diffuse.rgb", 0 },
        { FRAGMENT, "rgb_illumination_diffuse", "vec3", "rgb_light_diffuse", "!s" },
        { FRAGMENT, "rgb_illumination_diffuse", "vec3", "rgb_light_diffuse*l_shadow", "s" },
        { FRAGMENT, "rgb_light_diffuse[i]", "vec3", "l_diffuse[i]*light_sources[i].diffuse.rgb", 0 },


@@ -103,7 +103,7 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] =
        { FRAGMENT, "n_tbn_normal", "vec3", "normal_sample*2.0-1.0", "n" },
        { FRAGMENT, "n_eye_normal", "vec3", "normalize(eye_normal)", "!n" },
        { FRAGMENT, "normal_sample", "vec3", "texture2D(normalmap, texture_coord).xyz", 0 },
        { FRAGMENT, "n_tbn_normal", "vec3", "normal_sample*2.0-1.0", "n" },
        { FRAGMENT, "n_eye_normal", "vec3", "normalize(eye_normal)", "!n" },
        { FRAGMENT, "normal_sample", "vec3", "texture2D(normalmap, texture_coord).xyz", 0 },

-       { FRAGMENT, "tex_sample", "vec4", "texture2D(texture, texture_coord)", 0 },
+       { FRAGMENT, "diffuse_sample", "vec4", "texture2D(diffusemap, texture_coord)", 0 },

 
        { VERTEX, "gl_Position", "vec4", "projection_matrix*eye_vertex", 0 },
        { VERTEX, "shd_vertex", "vec3", "(shd_eye_matrix*eye_vertex).xyz", 0 },
 
        { VERTEX, "gl_Position", "vec4", "projection_matrix*eye_vertex", 0 },
        { VERTEX, "shd_vertex", "vec3", "(shd_eye_matrix*eye_vertex).xyz", 0 },


@@ -127,7 +127,7 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] =
        { ATTRIBUTE, "tangent", "vec3", 0, 0 },
        { ATTRIBUTE, "binormal", "vec3", 0, 0 },
 
        { ATTRIBUTE, "tangent", "vec3", 0, 0 },
        { ATTRIBUTE, "binormal", "vec3", 0, 0 },
 

-       { UNIFORM, "texture", "sampler2D", 0, 0 },
+       { UNIFORM, "diffusemap", "sampler2D", 0, 0 },

        { UNIFORM, "shadow", "sampler2DShadow", 0, 0 },
        { UNIFORM, "ShadowMap::shadow_darkness", "float", 0, 0 },
        { UNIFORM, "normalmap", "sampler2D", 0, 0 },
        { UNIFORM, "shadow", "sampler2DShadow", 0, 0 },
        { UNIFORM, "ShadowMap::shadow_darkness", "float", 0, 0 },
        { UNIFORM, "normalmap", "sampler2D", 0, 0 },


@@ -235,6 +235,12 @@ ProgramBuilder::ProgramBuilder(const StandardFeatures &f):
                        start = semicolon+1;
                }
        }
                        start = semicolon+1;
                }
        }

+
+       if((get_gl_api()==OPENGL && !features.legacy) || (get_gl_api()==OPENGL_ES2 && get_glsl_version()>=Version(3, 0)))
+       {
+               aliases["texture2D"] = "texture";
+               aliases["shadow2D"] = "texture";
+       }

 }
 
 void ProgramBuilder::set_optimize(bool o)
 }
 
 void ProgramBuilder::set_optimize(bool o)


@@ -464,13 +470,13 @@ string ProgramBuilder::create_source(const list<ShaderVariable *> &variables, Va
                                                        decl += "[i]";
                                        }
                                        const char *oper = ((*j)->array_sum ? "+=" : "=");
                                                        decl += "[i]";
                                        }
                                        const char *oper = ((*j)->array_sum ? "+=" : "=");

-                                       source += format("\t\t%s %s %s;\n", decl, oper, (*j)->create_expression("i"));
+                                       source += format("\t\t%s %s %s;\n", decl, oper, create_expression(**j, "i"));

                                }
 
                                InterfaceFlags interface = (*j)->get_interface_flags(scope);
                                if(interface&OUTPUT)
                                {
                                }
 
                                InterfaceFlags interface = (*j)->get_interface_flags(scope);
                                if(interface&OUTPUT)
                                {

-                                       string expr = ((*j)->inlined ? (*j)->create_expression("i") : (*j)->resolved_name+"[i]");
+                                       string expr = ((*j)->inlined ? create_expression(**j, "i") : (*j)->resolved_name+"[i]");

                                        source += format("\t\t%c_%s[i] = %s;\n", interfaces[scope], (*j)->resolved_name, expr);
                                }
                        }
                                        source += format("\t\t%c_%s[i] = %s;\n", interfaces[scope], (*j)->resolved_name, expr);
                                }
                        }


@@ -494,12 +500,12 @@ string ProgramBuilder::create_source(const list<ShaderVariable *> &variables, Va
                if((*i)->variable->scope==scope && !(*i)->inlined)
                {
                        string decl = ((interface&GOAL) ? (*i)->resolved_name : (*i)->create_declaration());
                if((*i)->variable->scope==scope && !(*i)->inlined)
                {
                        string decl = ((interface&GOAL) ? (*i)->resolved_name : (*i)->create_declaration());

-                       source += format("\t%s = %s;\n", decl, (*i)->create_expression());
+                       source += format("\t%s = %s;\n", decl, create_expression(**i));

                }
 
                if((interface&(OUTPUT|GOAL))==OUTPUT)
                {
                }
 
                if((interface&(OUTPUT|GOAL))==OUTPUT)
                {

-                       string expr = ((*i)->inlined ? (*i)->create_expression() : (*i)->resolved_name);
+                       string expr = ((*i)->inlined ? create_expression(**i) : (*i)->resolved_name);

                        source += format("\t%c_%s = %s;\n", interfaces[scope], (*i)->resolved_name, expr);
                }
        }
                        source += format("\t%c_%s = %s;\n", interfaces[scope], (*i)->resolved_name, expr);
                }
        }


@@ -664,6 +670,12 @@ string ProgramBuilder::replace_identifiers(const char *expression, const map<str
        return result;
 }
 
        return result;
 }
 

+string ProgramBuilder::create_expression(const ShaderVariable &var, const char *loop) const
+{
+       string expr = var.create_expression(loop);
+       return replace_identifiers(expr.c_str(), aliases);
+}
+

 
 ProgramBuilder::StandardFeatures::StandardFeatures():
        texture(false),
 
 ProgramBuilder::StandardFeatures::StandardFeatures():
        texture(false),

diff --git a/source/programbuilder.h b/source/programbuilder.h
index 9860b4683320ad335dda5b6fdc5072b8ef0b5f6f..9ca9c8539b54c1046a2d97b29e7b854506c128d2 100644 (file)
--- a/source/programbuilder.h
+++ b/source/programbuilder.h
@@ -128,6 +128,7 @@ private:
        StandardFeatures features;
        std::list<VariableDefinition> custom_variables;
        std::string feature_flags;
        StandardFeatures features;
        std::list<VariableDefinition> custom_variables;
        std::string feature_flags;

+       std::map<std::string, std::string> aliases;

        bool optimize;
 
        static const VariableDefinition standard_variables[];
        bool optimize;
 
        static const VariableDefinition standard_variables[];


@@ -147,6 +148,7 @@ private:
        static bool parse_identifier(const char *, unsigned &, unsigned &);
        static std::vector<std::string> extract_identifiers(const char *);
        static std::string replace_identifiers(const char *, const std::map<std::string, std::string> &);
        static bool parse_identifier(const char *, unsigned &, unsigned &);
        static std::vector<std::string> extract_identifiers(const char *);
        static std::string replace_identifiers(const char *, const std::map<std::string, std::string> &);

+       std::string create_expression(const ShaderVariable &, const char * = 0) const;

 };
 
 } // namespace GL
 };
 
 } // namespace GL