Mesa (gles3): mesa: Allow glGet* queries on ARB_fragment/ vertex_shader data in ES 3
Matt Turner
mattst88 at kemper.freedesktop.org
Tue Nov 20 04:19:40 UTC 2012
Module: Mesa
Branch: gles3
Commit: 2ad06f332830a717339fe42e92451988ebd21f80
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2ad06f332830a717339fe42e92451988ebd21f80
Author: Matt Turner <mattst88 at gmail.com>
Date: Sat Nov 17 16:38:05 2012 -0800
mesa: Allow glGet* queries on ARB_fragment/vertex_shader data in ES 3
Fixes uniform_buffer_object_implementation_dependent_limits in
es3conform.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/mesa/main/get.c | 11 +++++++++++
src/mesa/main/get_hash_params.py | 14 +++++++-------
2 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 9b9d995..b28cf6b 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -301,6 +301,12 @@ static const int extra_texture_buffer_object[] = {
EXTRA_END
};
+static const int extra_ARB_fragment_shader_api_es3[] = {
+ EXT(ARB_fragment_shader),
+ EXTRA_API_ES3,
+ EXTRA_END
+};
+
static const int extra_ARB_framebuffer_object_EXT_framebuffer_multisample_api_es3[] = {
EXT(ARB_framebuffer_object),
EXT(EXT_framebuffer_multisample),
@@ -332,6 +338,11 @@ static const int extra_ARB_uniform_buffer_object_and_geometry_shader[] = {
EXTRA_END
};
+static const int extra_ARB_vertex_shader_api_es3[] = {
+ EXT(ARB_vertex_shader),
+ EXTRA_API_ES3,
+ EXTRA_END
+};
EXTRA_EXT(ARB_ES2_compatibility);
EXTRA_EXT(ARB_texture_cube_map);
diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py
index 730eedc..944742a 100644
--- a/src/mesa/main/get_hash_params.py
+++ b/src/mesa/main/get_hash_params.py
@@ -232,13 +232,6 @@ descriptor=[
# GL_OES_point_sprite
[ "POINT_SPRITE_NV", "CONTEXT_BOOL(Point.PointSprite), extra_NV_point_sprite_ARB_point_sprite" ],
-# GL_ARB_fragment_shader
- [ "MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB", "CONTEXT_INT(Const.FragmentProgram.MaxUniformComponents), extra_ARB_fragment_shader" ],
-
-# GL_ARB_vertex_shader
- [ "MAX_VERTEX_UNIFORM_COMPONENTS_ARB", "CONTEXT_INT(Const.VertexProgram.MaxUniformComponents), extra_ARB_vertex_shader" ],
- [ "MAX_VARYING_FLOATS_ARB", "LOC_CUSTOM, TYPE_INT, 0, extra_ARB_vertex_shader" ],
-
# GL_EXT_texture_lod_bias
[ "MAX_TEXTURE_LOD_BIAS_EXT", "CONTEXT_FLOAT(Const.MaxTextureLodBias), NO_EXTRA" ],
]},
@@ -670,6 +663,13 @@ descriptor=[
[ "MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS", "CONTEXT_INT(Const.MaxTransformFeedbackBuffers), extra_EXT_transform_feedback_api_es3" ],
[ "MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS", "CONTEXT_INT(Const.MaxTransformFeedbackSeparateComponents), extra_EXT_transform_feedback_api_es3" ],
+# GL_ARB_fragment_shader
+ [ "MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB", "CONTEXT_INT(Const.FragmentProgram.MaxUniformComponents), extra_ARB_fragment_shader_api_es3" ],
+
+# GL_ARB_vertex_shader
+ [ "MAX_VERTEX_UNIFORM_COMPONENTS_ARB", "CONTEXT_INT(Const.VertexProgram.MaxUniformComponents), extra_ARB_vertex_shader_api_es3" ],
+ [ "MAX_VARYING_FLOATS_ARB", "LOC_CUSTOM, TYPE_INT, 0, extra_ARB_vertex_shader" ],
+
# GL_ARB_framebuffer_object
[ "MAX_SAMPLES", "CONTEXT_INT(Const.MaxSamples), extra_ARB_framebuffer_object_EXT_framebuffer_multisample_api_es3" ],
More information about the mesa-commit
mailing list