Revert "Add a hack to use #version 110 but keep using 130 features, for the benefit...

[movit] / util.cpp

diff --git a/util.cpp b/util.cpp
index 675b25b4940c3d9a9048d3d4488220340b31817b..d50039993bafc08853fe1278803f053212521f71 100644 (file)
--- a/util.cpp
+++ b/util.cpp
@@ -127,12 +127,7 @@ string read_file(const string &filename)
 
 string read_version_dependent_file(const string &base, const string &extension)
 {
-       if (movit_shader_model == MOVIT_GLSL_130_AS_110) {
-               string contents = read_file(base + ".130." + extension);
-               assert(contents.find("#version 130") == 0);
-               contents[10] = '1';  // Change from 130 to 110.
-               return contents;
-       } else if (movit_shader_model == MOVIT_GLSL_130) {
+       if (movit_shader_model == MOVIT_GLSL_130) {
                return read_file(base + ".130." + extension);
        } else if (movit_shader_model == MOVIT_GLSL_150) {
                return read_file(base + ".150." + extension);