summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2012-10-05 15:22:54 -0700
committerIan Romanick <[email protected]>2012-10-07 20:35:42 -0700
commit0242381f06edb09dcf0eaacd6d26ccd8584700cc (patch)
tree0b25944e1d82bb17e3823bb8c9fd2f86682fc36d /src/mesa
parent3308c079bd00e9b9aa546f5214ce197a904d059b (diff)
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 <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Anuj Phogat <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/common/meta.c2
1 files changed, 1 insertions, 1 deletions
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;