[Mesa-dev] [PATCH v3 3/3] main/get: make KHR_debug enums available everywhere

[Timothy Arceri]

On Sat, 2014-09-06 at 10:52 +1000, Matthew Waters wrote:
> On 06/09/14 09:33, Timothy Arceri wrote:
> > I'm not sure if this is correct or not I'll leave that for someone else
> > to comment on, but there doesn't seem to be any reason for you to move
> > the location of the code. Especially the GL_KHR_debug (GL 4.3)/
> > GL_ARB_debug_output stuff this should only need to be a one line patch.
> 
> The movement is so that it is possible to glGet the parameters from gles
> contexts.  Otherwise it fails with a GL error.

Ok I see now. I was thrown by the commit message as to what you were
trying to do.

> 
> > On Sun, 2014-08-31 at 20:21 +1000, Matthew Waters wrote:
> >> Although GL_CONTEXT_FLAGS is not explicitly added by KHR_debug,
> >> it contains,
> >>
> >>     "It is implementation defined how much debug output is generated if
> >>     the context was created without the CONTEXT_DEBUG_BIT set. This is a new
> >>     query bit added to the existing GL_CONTEXT_FLAGS state to specify whether
> >>     the context was created with debug enabled."
> >>
> >> implying the GL_CONTEXT_FLAGS parameter is supported whenever KHR_debug
> >> is also supported.
> >>
> >> Signed-off-by: Matthew Waters <ystreet00 at gmail.com>
> >> ---
> >>  src/mesa/main/get_hash_params.py | 24 ++++++++++++------------
> >>  1 file changed, 12 insertions(+), 12 deletions(-)
> >>
> >> diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py
> >> index aace8a5..932944d 100644
> >> --- a/src/mesa/main/get_hash_params.py
> >> +++ b/src/mesa/main/get_hash_params.py
> >> @@ -124,6 +124,18 @@ descriptor=[
> >>  
> >>  # GL_EXT_texture_filter_anisotropic
> >>    [ "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_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" ],
> >> +  [ "MAX_DEBUG_MESSAGE_LENGTH", "CONST(MAX_DEBUG_MESSAGE_LENGTH), NO_EXTRA" ],
> >> +  [ "MAX_LABEL_LENGTH", "CONST(MAX_LABEL_LENGTH), NO_EXTRA" ],
> >> +  [ "MAX_DEBUG_GROUP_STACK_DEPTH", "CONST(MAX_DEBUG_GROUP_STACK_DEPTH), NO_EXTRA" ],
> >> +  [ "DEBUG_GROUP_STACK_DEPTH", "LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA" ],
> >> +
> >> +# GL 3.0 / KHR_debug
> >> +  [ "CONTEXT_FLAGS", "CONTEXT_INT(Const.ContextFlags), NO_EXTRA" ],
> >>  ]},
> >>  
> >>  # Enums in OpenGL and GLES1
> >> @@ -694,9 +706,6 @@ descriptor=[
> >>  # GL_ARB_sampler_objects / GL 3.3
> >>    [ "SAMPLER_BINDING", "LOC_CUSTOM, TYPE_INT, GL_SAMPLER_BINDING, NO_EXTRA" ],
> >>  
> >> -# GL 3.0
> >> -  [ "CONTEXT_FLAGS", "CONTEXT_INT(Const.ContextFlags), extra_version_30" ],
> >> -
> >>  # GL3.0 / GL_EXT_framebuffer_sRGB
> >>    [ "FRAMEBUFFER_SRGB_EXT", "CONTEXT_BOOL(Color.sRGBEnabled), extra_EXT_framebuffer_sRGB" ],
> >>    [ "FRAMEBUFFER_SRGB_CAPABLE_EXT", "BUFFER_INT(Visual.sRGBCapable), extra_EXT_framebuffer_sRGB_and_new_buffers" ],
> >> @@ -718,15 +727,6 @@ descriptor=[
> >>  # GL_ARB_robustness
> >>    [ "RESET_NOTIFICATION_STRATEGY_ARB", "CONTEXT_ENUM(Const.ResetStrategy), NO_EXTRA" ],
> >>  
> >> -# GL_KHR_debug (GL 4.3)/ GL_ARB_debug_output
> >> -  [ "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" ],
> >> -  [ "MAX_DEBUG_MESSAGE_LENGTH", "CONST(MAX_DEBUG_MESSAGE_LENGTH), NO_EXTRA" ],
> >> -  [ "MAX_LABEL_LENGTH", "CONST(MAX_LABEL_LENGTH), NO_EXTRA" ],
> >> -  [ "MAX_DEBUG_GROUP_STACK_DEPTH", "CONST(MAX_DEBUG_GROUP_STACK_DEPTH), NO_EXTRA" ],
> >> -  [ "DEBUG_GROUP_STACK_DEPTH", "LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA" ],
> >> -
> >>    [ "MAX_DUAL_SOURCE_DRAW_BUFFERS", "CONTEXT_INT(Const.MaxDualSourceDrawBuffers), extra_ARB_blend_func_extended" ],
> >>  
> >>  # GL_ARB_uniform_buffer_object
> >
> 
>