diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2016-03-03 00:43:15 -0800 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-03-04 14:48:25 +0000 |
| commit | 3d32af2d59a486761fdb030cbccdf6e8308ff83f (patch) | |
| tree | 1ad2348f7a896f0a9dfb8387b1e50fc0ca067e33 | |
| parent | c9da4f896685e061947f41664d4fb7492a31327d (diff) | |
mesa: Allow Get*() of several forgotten IsEnabled() pnames.
From section 6.2 ("State Tables") of the GL 2.1 specification
(the text also appears in the GL 3.0 and ES 3.1 specifications):
"However, state variables for which IsEnabled is listed as the query
command can also be obtained using GetBooleanv, GetIntegerv, GetFloatv,
and GetDoublev."
GL_DEBUG_OUTPUT, GL_DEBUG_OUTPUT_SYNCHRONOUS, and GL_FRAGMENT_SHADER_ATI
were missing from the glGet*() functions. All other IsEnabled() pnames
look to be present, as far as I can tell.
Fixes 8 dEQP-GLES31.functional.debug.state_query subtests:
debug_output[_synchronous]_get{boolean,float,integer,integer64}.
Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
(cherry picked from commit aa37cbdff7bb1d2170f1603b02a8b8517255894f)
| -rw-r--r-- | src/mesa/main/get.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/get_hash_params.py | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index f40c570581..4cc82d8bf4 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -1055,6 +1055,8 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu } break; /* GL_KHR_DEBUG */ + case GL_DEBUG_OUTPUT: + case GL_DEBUG_OUTPUT_SYNCHRONOUS: case GL_DEBUG_LOGGED_MESSAGES: case GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH: case GL_DEBUG_GROUP_STACK_DEPTH: diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py index 07d2d20df7..f9d66f8db7 100644 --- a/src/mesa/main/get_hash_params.py +++ b/src/mesa/main/get_hash_params.py @@ -126,6 +126,8 @@ descriptor=[ [ "MAX_TEXTURE_MAX_ANISOTROPY_EXT", "CONTEXT_FLOAT(Const.MaxTextureMaxAnisotropy), extra_EXT_texture_filter_anisotropic" ], # GL_KHR_debug (GL 4.3)/ GL_ARB_debug_output + [ "DEBUG_OUTPUT", "LOC_CUSTOM, TYPE_BOOLEAN, 0, NO_EXTRA" ], + [ "DEBUG_OUTPUT_SYNCHRONOUS", "LOC_CUSTOM, TYPE_BOOLEAN, 0, NO_EXTRA" ], [ "DEBUG_LOGGED_MESSAGES", "LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA" ], [ "DEBUG_NEXT_LOGGED_MESSAGE_LENGTH", "LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA" ], [ "MAX_DEBUG_LOGGED_MESSAGES", "CONST(MAX_DEBUG_LOGGED_MESSAGES), NO_EXTRA" ], @@ -773,6 +775,7 @@ descriptor=[ [ "DEPTH_CLAMP", "CONTEXT_BOOL(Transform.DepthClamp), extra_ARB_depth_clamp" ], # GL_ATI_fragment_shader + [ "FRAGMENT_SHADER_ATI", "CONTEXT_BOOL(ATIFragmentShader.Enabled), extra_ATI_fragment_shader" ], [ "NUM_FRAGMENT_REGISTERS_ATI", "CONST(6), extra_ATI_fragment_shader" ], [ "NUM_FRAGMENT_CONSTANTS_ATI", "CONST(8), extra_ATI_fragment_shader" ], [ "NUM_PASSES_ATI", "CONST(2), extra_ATI_fragment_shader" ], |