[Mesa-dev] [PATCH 2/5] glsl: Disable ARB_texture_rectangle in shader version 100.

Matt Turner mattst88 at gmail.com
Fri Jan 17 21:09:18 PST 2014


From: Anuj Phogat <anuj.phogat at gmail.com>

OpenGL with ARB_ES2_compatibility allows shaders that specify #version
100.

This fixes the Khronos OpenGL test(Texture_Rectangle_Samplers_frag.test)
failure.

Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
---
 src/glsl/glsl_parser_extras.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
index e67988f..c2ef3a0 100644
--- a/src/glsl/glsl_parser_extras.cpp
+++ b/src/glsl/glsl_parser_extras.cpp
@@ -291,6 +291,10 @@ _mesa_glsl_parse_state::process_version_directive(YYLTYPE *locp, int version,
       }
    }
 
+   if (this->es_shader) {
+      this->ARB_texture_rectangle_enable = false;
+   }
+
    this->language_version = version;
 
    bool supported = false;
-- 
1.8.3.2



More information about the mesa-dev mailing list