mesa/st: drop emit string marker device table entry.
Just check for the gallium callback instead Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14632>
This commit is contained in:
parent
5618fac786
commit
10ac88b72f
|
@ -199,13 +199,6 @@ struct dd_function_table {
|
||||||
struct gl_buffer_object *indexbuf,
|
struct gl_buffer_object *indexbuf,
|
||||||
uint32_t enabled_attribs);
|
uint32_t enabled_attribs);
|
||||||
|
|
||||||
/**
|
|
||||||
* \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
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1089,8 +1089,8 @@ _mesa_DebugMessageInsert(GLenum source, GLenum type, GLuint id,
|
||||||
gl_enum_to_debug_severity(severity),
|
gl_enum_to_debug_severity(severity),
|
||||||
length, buf);
|
length, buf);
|
||||||
|
|
||||||
if (type == GL_DEBUG_TYPE_MARKER && ctx->Driver.EmitStringMarker) {
|
if (type == GL_DEBUG_TYPE_MARKER && ctx->pipe->emit_string_marker) {
|
||||||
ctx->Driver.EmitStringMarker(ctx, buf, length);
|
ctx->pipe->emit_string_marker(ctx->pipe, buf, length);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1376,7 +1376,7 @@ _mesa_StringMarkerGREMEDY(GLsizei len, const GLvoid *string)
|
||||||
/* if length not specified, string will be null terminated: */
|
/* if length not specified, string will be null terminated: */
|
||||||
if (len <= 0)
|
if (len <= 0)
|
||||||
len = strlen(string);
|
len = strlen(string);
|
||||||
ctx->Driver.EmitStringMarker(ctx, string, len);
|
ctx->pipe->emit_string_marker(ctx->pipe, string, len);
|
||||||
} else {
|
} else {
|
||||||
_mesa_error(ctx, GL_INVALID_OPERATION, "StringMarkerGREMEDY");
|
_mesa_error(ctx, GL_INVALID_OPERATION, "StringMarkerGREMEDY");
|
||||||
}
|
}
|
||||||
|
|
|
@ -810,15 +810,6 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
|
||||||
return st;
|
return st;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void
|
|
||||||
st_emit_string_marker(struct gl_context *ctx, const GLchar *string, GLsizei len)
|
|
||||||
{
|
|
||||||
struct st_context *st = ctx->st;
|
|
||||||
st->pipe->emit_string_marker(st->pipe, string, len);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
st_set_background_context(struct gl_context *ctx,
|
st_set_background_context(struct gl_context *ctx,
|
||||||
struct util_queue_monitoring *queue_info)
|
struct util_queue_monitoring *queue_info)
|
||||||
|
@ -855,9 +846,6 @@ st_init_driver_functions(struct pipe_screen *screen,
|
||||||
|
|
||||||
st_init_vdpau_functions(functions);
|
st_init_vdpau_functions(functions);
|
||||||
|
|
||||||
if (screen->get_param(screen, PIPE_CAP_STRING_MARKER))
|
|
||||||
functions->EmitStringMarker = st_emit_string_marker;
|
|
||||||
|
|
||||||
/* GL_ARB_get_program_binary */
|
/* GL_ARB_get_program_binary */
|
||||||
functions->GetProgramBinaryDriverSHA1 = st_get_program_binary_driver_sha1;
|
functions->GetProgramBinaryDriverSHA1 = st_get_program_binary_driver_sha1;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue