meta: Don't use GLSL 1.30 shader on OpenGL ES 2
authorIan Romanick <ian.d.romanick@intel.com>
Fri, 5 Oct 2012 22:22:54 +0000 (15:22 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Mon, 8 Oct 2012 03:35:42 +0000 (20:35 -0700)
Fixes GLES2 CoverageGL conformance test.

NOTE: This is a candidate for the 9.0 branch.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
src/mesa/drivers/common/meta.c

index 10dc49598a0b9f505059bbf069fd2b26b0a22f07..7da0db79832a0e3c579dc0bebdfccb31786bbae6 100644 (file)
@@ -3100,7 +3100,7 @@ setup_glsl_generate_mipmap(struct gl_context *ctx,
 
    mem_ctx = ralloc_context(NULL);
 
-   if (ctx->Const.GLSLVersion < 130) {
+   if (ctx->API == API_OPENGLES2 || ctx->Const.GLSLVersion < 130) {
       const char *fs_template;
       const char *extension_mode;