meta: Use #version 300 es in GenerateMipmap shaders on ES3.
authorKenneth Graunke <kenneth@whitecape.org>
Tue, 20 Nov 2012 05:51:25 +0000 (21:51 -0800)
committerIan Romanick <ian.d.romanick@intel.com>
Sat, 8 Dec 2012 00:29:31 +0000 (16:29 -0800)
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
src/mesa/drivers/common/meta.c

index ad21fa863d32f776481b866afb97bae6adfc4378..0fba681ff156d81a04cf02956facabdebce0f861 100644 (file)
@@ -3112,18 +3112,19 @@ setup_glsl_generate_mipmap(struct gl_context *ctx,
                                   sampler->func, sampler->texcoords);
    }
    else {
-      vs_source =
-         "#version 130\n"
-         "in vec2 position;\n"
-         "in vec3 textureCoords;\n"
-         "out vec3 texCoords;\n"
-         "void main()\n"
-         "{\n"
-         "   texCoords = textureCoords;\n"
-         "   gl_Position = vec4(position, 0.0, 1.0);\n"
-         "}\n";
+      vs_source = ralloc_asprintf(mem_ctx,
+                                  "#version %s\n"
+                                  "in vec2 position;\n"
+                                  "in vec3 textureCoords;\n"
+                                  "out vec3 texCoords;\n"
+                                  "void main()\n"
+                                  "{\n"
+                                  "   texCoords = textureCoords;\n"
+                                  "   gl_Position = vec4(position, 0.0, 1.0);\n"
+                                  "}\n",
+                                  _mesa_is_desktop_gl(ctx) ? "130" : "300 es");
       fs_source = ralloc_asprintf(mem_ctx,
-                                  "#version 130\n"
+                                  "#version %s\n"
                                   "uniform %s texSampler;\n"
                                   "in vec3 texCoords;\n"
                                   "out vec4 out_color;\n"
@@ -3132,6 +3133,7 @@ setup_glsl_generate_mipmap(struct gl_context *ctx,
                                   "{\n"
                                   "   out_color = texture(texSampler, %s);\n"
                                   "}\n",
+                                  _mesa_is_desktop_gl(ctx) ? "130" : "300 es",
                                   sampler->type,
                                   sampler->texcoords);
    }