Mesa (master): glsl: Disable ARB_texture_rectangle in shader version 100.
Matt Turner
mattst88 at kemper.freedesktop.org
Thu Jan 23 19:32:22 UTC 2014
Module: Mesa
Branch: master
Commit: c907595ba77a0c74b18b6908f71fafc3c08e2886
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c907595ba77a0c74b18b6908f71fafc3c08e2886
Author: Anuj Phogat <anuj.phogat at gmail.com>
Date: Fri Jan 17 12:23:05 2014 -0800
glsl: Disable ARB_texture_rectangle in shader version 100.
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>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.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 e550187..87784ed 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;
More information about the mesa-commit
mailing list