Mesa (master): meta: Improve GLSL version check

[Eric Anholt]

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

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Mon Dec 16 13:10:11 2013 -0800

meta: Improve GLSL version check

We want to use the GLSL 1.30-ish path for OpenGL ES 3.0.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Eric Anholt <eric at anholt.net>

---

 src/mesa/drivers/common/meta.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 40e1f37..a40bf08 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -461,7 +461,12 @@ setup_shader_for_sampler(struct gl_context *ctx, struct glsl_sampler *sampler)
    if (sampler->shader_prog != 0)
       return sampler->shader_prog;
 
-   if (ctx->API == API_OPENGLES2 || ctx->Const.GLSLVersion < 130) {
+   /* The version check is a little tricky.  API is set to API_OPENGLES2 even
+    * for OpenGL ES 3.0 contexts, and GLSLVersion may be set to 140, for
+    * example, in an OpenGL ES 2.0 context.
+    */
+   if ((ctx->API == API_OPENGLES2 && ctx->Version < 30)
+       || ctx->Const.GLSLVersion < 130) {
       vs_source =
          "attribute vec2 position;\n"
          "attribute vec3 textureCoords;\n"