Mesa (master): meta: Don't use GLSL 1.30 shader on OpenGL ES 2

[Ian Romanick]

Module: Mesa
Branch: master
Commit: 0242381f06edb09dcf0eaacd6d26ccd8584700cc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0242381f06edb09dcf0eaacd6d26ccd8584700cc

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Fri Oct  5 15:22:54 2012 -0700

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 <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>

---

 src/mesa/drivers/common/meta.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 10dc495..7da0db7 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;