Mesa (master): main: return two minor digits for ES shading language version
Iago Toral Quiroga
itoral at kemper.freedesktop.org
Tue Dec 9 10:46:07 UTC 2014
Module: Mesa
Branch: master
Commit: 6cc72511850961eba408a44f648c7067b6e68594
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6cc72511850961eba408a44f648c7067b6e68594
Author: Samuel Iglesias Gonsalvez <siglesias at igalia.com>
Date: Wed Nov 26 13:16:38 2014 +0100
main: return two minor digits for ES shading language version
For OpenGL ES 3.0 spec, the minor number for SHADING_LANGUAGE_VERSION is always
two digits, matching the OpenGL ES Shading Language Specification release
number. For example, this query might return the string "3.00".
This patch fixes the following dEQP test:
dEQP-GLES3.functional.state_query.string.shading_language_version
No piglit regression observed.
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias at igalia.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
---
src/mesa/main/getstring.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c
index f9d13a7..1b2c7f0 100644
--- a/src/mesa/main/getstring.c
+++ b/src/mesa/main/getstring.c
@@ -74,7 +74,7 @@ shading_language_version(struct gl_context *ctx)
case API_OPENGLES2:
return (ctx->Version < 30)
? (const GLubyte *) "OpenGL ES GLSL ES 1.0.16"
- : (const GLubyte *) "OpenGL ES GLSL ES 3.0";
+ : (const GLubyte *) "OpenGL ES GLSL ES 3.00";
case API_OPENGLES:
/* fall-through */
More information about the mesa-commit
mailing list