From 0242381f06edb09dcf0eaacd6d26ccd8584700cc Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Fri, 5 Oct 2012 15:22:54 -0700 Subject: [PATCH] meta: Don't use GLSL 1.30 shader on OpenGL ES 2 Fixes GLES2 CoverageGL conformance test. NOTE: This is a candidate for the 9.0 branch. Signed-off-by: Ian Romanick Reviewed-by: Kenneth Graunke Reviewed-by: Brian Paul Reviewed-by: Anuj Phogat --- src/mesa/drivers/common/meta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 10dc49598a0..7da0db79832 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -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; -- 2.30.2