From acc481ad79e1b505966bad3140032e928761dabf Mon Sep 17 00:00:00 2001 From: Rhys Kidd Date: Fri, 10 Aug 2018 12:40:09 -0400 Subject: [PATCH] vc4: Wire up core pipe_debug_callback This lets the driver use pipe_debug_message() for GL_ARB_debug_output. Signed-off-by: Rhys Kidd Reviewed-by: Eric Anholt --- src/gallium/drivers/vc4/vc4_context.c | 13 +++++++++++++ src/gallium/drivers/vc4/vc4_context.h | 1 + 2 files changed, 14 insertions(+) diff --git a/src/gallium/drivers/vc4/vc4_context.c b/src/gallium/drivers/vc4/vc4_context.c index ffd7d4c8555..94969dcb133 100644 --- a/src/gallium/drivers/vc4/vc4_context.c +++ b/src/gallium/drivers/vc4/vc4_context.c @@ -84,6 +84,18 @@ vc4_texture_barrier(struct pipe_context *pctx, unsigned flags) vc4_flush(pctx); } +static void +vc4_set_debug_callback(struct pipe_context *pctx, + const struct pipe_debug_callback *cb) +{ + struct vc4_context *vc4 = vc4_context(pctx); + + if (cb) + vc4->debug = *cb; + else + memset(&vc4->debug, 0, sizeof(vc4->debug)); +} + static void vc4_invalidate_resource(struct pipe_context *pctx, struct pipe_resource *prsc) { @@ -164,6 +176,7 @@ vc4_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags) pctx->priv = priv; pctx->destroy = vc4_context_destroy; pctx->flush = vc4_pipe_flush; + pctx->set_debug_callback = vc4_set_debug_callback; pctx->invalidate_resource = vc4_invalidate_resource; pctx->texture_barrier = vc4_texture_barrier; diff --git a/src/gallium/drivers/vc4/vc4_context.h b/src/gallium/drivers/vc4/vc4_context.h index 8a8d3b6d5b0..f8f47958d8f 100644 --- a/src/gallium/drivers/vc4/vc4_context.h +++ b/src/gallium/drivers/vc4/vc4_context.h @@ -405,6 +405,7 @@ struct vc4_context { struct pipe_viewport_state viewport; struct vc4_constbuf_stateobj constbuf[PIPE_SHADER_TYPES]; struct vc4_vertexbuf_stateobj vertexbuf; + struct pipe_debug_callback debug; struct vc4_hwperfmon *perfmon; /** @} */ -- 2.30.2