[Mesa-dev] [PATCH 3/6] meta: Don't use GLSL 1.30 shader on OpenGL ES 2

Ian Romanick idr at freedesktop.org
Fri Oct 5 15:56:49 PDT 2012


From: Ian Romanick <ian.d.romanick at intel.com>

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>
---
 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 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;
 
-- 
1.7.11.4



More information about the mesa-dev mailing list