mesa: add GREMEDY_string_marker

Signed-off-by: Rob Clark <robclark@freedesktop.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Rob Clark
2015-08-10 10:37:53 -04:00
parent cbf0e64ee1
commit 1f7a96e005
9 changed files with 49 additions and 0 deletions

View File

@@ -0,0 +1,18 @@
<?xml version="1.0"?>
<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
<!-- Note: no GLX protocol info yet. -->
<OpenGLAPI>
<category name="GL_GREMEDY_string_marker" number="311">
<function name="StringMarkerGREMEDY">
<param name="len" type="GLsizei"/>
<param name="string" type="const GLvoid *"/>
</function>
</category>
</OpenGLAPI>

View File

@@ -196,6 +196,7 @@ API_XML = \
EXT_texture_array.xml \ EXT_texture_array.xml \
EXT_texture_integer.xml \ EXT_texture_integer.xml \
EXT_transform_feedback.xml \ EXT_transform_feedback.xml \
GREMEDY_string_marker.xml \
INTEL_performance_query.xml \ INTEL_performance_query.xml \
KHR_debug.xml \ KHR_debug.xml \
KHR_context_flush_control.xml \ KHR_context_flush_control.xml \

View File

@@ -12620,6 +12620,8 @@
<xi:include href="EXT_framebuffer_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="EXT_framebuffer_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="GREMEDY_string_marker.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="EXT_packed_depth_stencil.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="EXT_packed_depth_stencil.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="EXT_provoking_vertex.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="EXT_provoking_vertex.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

View File

@@ -762,6 +762,12 @@ struct dd_function_table {
void (*UseProgram)(struct gl_context *ctx, struct gl_shader_program *shProg); void (*UseProgram)(struct gl_context *ctx, struct gl_shader_program *shProg);
/*@}*/ /*@}*/
/**
* \name GREMEDY debug/marker functions
*/
/*@{*/
void (*EmitStringMarker)(struct gl_context *ctx, const GLchar *string, GLsizei len);
/*@}*/
/** /**
* \name Support for multiple T&L engines * \name Support for multiple T&L engines

View File

@@ -1276,6 +1276,19 @@ _mesa_free_errors_data(struct gl_context *ctx)
mtx_destroy(&ctx->DebugMutex); mtx_destroy(&ctx->DebugMutex);
} }
void GLAPIENTRY
_mesa_StringMarkerGREMEDY(GLsizei len, const GLvoid *string)
{
GET_CURRENT_CONTEXT(ctx);
if (ctx->Extensions.GREMEDY_string_marker) {
/* if length not specified, string will be null terminated: */
if (len <= 0)
len = strlen(string);
ctx->Driver.EmitStringMarker(ctx, string, len);
} else {
_mesa_error(ctx, GL_INVALID_OPERATION, "StringMarkerGREMEDY");
}
}
/**********************************************************************/ /**********************************************************************/
/** \name Diagnostics */ /** \name Diagnostics */

View File

@@ -138,6 +138,9 @@ _mesa_PushDebugGroup(GLenum source, GLuint id, GLsizei length,
void GLAPIENTRY void GLAPIENTRY
_mesa_PopDebugGroup(void); _mesa_PopDebugGroup(void);
void GLAPIENTRY
_mesa_StringMarkerGREMEDY(GLsizei len, const GLvoid *string);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

View File

@@ -251,6 +251,8 @@ EXT(EXT_unpack_subimage , dummy_true
EXT(EXT_vertex_array , dummy_true , GLL, x , x , x , 1995) EXT(EXT_vertex_array , dummy_true , GLL, x , x , x , 1995)
EXT(EXT_vertex_array_bgra , EXT_vertex_array_bgra , GLL, GLC, x , x , 2008) EXT(EXT_vertex_array_bgra , EXT_vertex_array_bgra , GLL, GLC, x , x , 2008)
EXT(GREMEDY_string_marker , GREMEDY_string_marker , GLL, GLC, x , x , 2007)
EXT(IBM_multimode_draw_arrays , dummy_true , GLL, GLC, x , x , 1998) EXT(IBM_multimode_draw_arrays , dummy_true , GLL, GLC, x , x , 1998)
EXT(IBM_rasterpos_clip , dummy_true , GLL, x , x , x , 1996) EXT(IBM_rasterpos_clip , dummy_true , GLL, x , x , x , 1996)
EXT(IBM_texture_mirrored_repeat , dummy_true , GLL, x , x , x , 1998) EXT(IBM_texture_mirrored_repeat , dummy_true , GLL, x , x , x , 1998)

View File

@@ -3880,6 +3880,7 @@ struct gl_extensions
GLboolean ATI_texture_env_combine3; GLboolean ATI_texture_env_combine3;
GLboolean ATI_fragment_shader; GLboolean ATI_fragment_shader;
GLboolean ATI_separate_stencil; GLboolean ATI_separate_stencil;
GLboolean GREMEDY_string_marker;
GLboolean INTEL_performance_query; GLboolean INTEL_performance_query;
GLboolean KHR_texture_compression_astc_hdr; GLboolean KHR_texture_compression_astc_hdr;
GLboolean KHR_texture_compression_astc_ldr; GLboolean KHR_texture_compression_astc_ldr;

View File

@@ -940,6 +940,9 @@ const struct function common_desktop_functions_possible[] = {
{ "glGetTextureSubImage", 20, -1 }, { "glGetTextureSubImage", 20, -1 },
{ "glGetCompressedTextureSubImage", 20, -1 }, { "glGetCompressedTextureSubImage", 20, -1 },
/* GL_GREMEDY_string_marker */
{ "glStringMarkerGREMEDY", 15, -1 },
{ NULL, 0, -1 } { NULL, 0, -1 }
}; };