Mesa (master): v3d: Wire up core pipe_debug_callback

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: d3991d247222122bdfba730cf76628374ac95668
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d3991d247222122bdfba730cf76628374ac95668

Author: Rhys Kidd <rhyskidd at gmail.com>
Date:   Fri Aug 10 12:40:10 2018 -0400

v3d: Wire up core pipe_debug_callback

This lets the driver use pipe_debug_message() for GL_ARB_debug_output.

Signed-off-by: Rhys Kidd <rhyskidd at gmail.com>
Reviewed-by: Eric Anholt <eric at anholt.net>

---

 src/gallium/drivers/v3d/v3d_context.c | 13 +++++++++++++
 src/gallium/drivers/v3d/v3d_context.h |  1 +
 2 files changed, 14 insertions(+)

diff --git a/src/gallium/drivers/v3d/v3d_context.c b/src/gallium/drivers/v3d/v3d_context.c
index 36c8f49782..1b148ecda2 100644
--- a/src/gallium/drivers/v3d/v3d_context.c
+++ b/src/gallium/drivers/v3d/v3d_context.c
@@ -66,6 +66,18 @@ v3d_pipe_flush(struct pipe_context *pctx, struct pipe_fence_handle **fence,
 }
 
 static void
+v3d_set_debug_callback(struct pipe_context *pctx,
+                       const struct pipe_debug_callback *cb)
+{
+        struct v3d_context *v3d = v3d_context(pctx);
+
+        if (cb)
+                v3d->debug = *cb;
+        else
+                memset(&v3d->debug, 0, sizeof(v3d->debug));
+}
+
+static void
 v3d_invalidate_resource(struct pipe_context *pctx, struct pipe_resource *prsc)
 {
         struct v3d_context *v3d = v3d_context(pctx);
@@ -139,6 +151,7 @@ v3d_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags)
         pctx->priv = priv;
         pctx->destroy = v3d_context_destroy;
         pctx->flush = v3d_pipe_flush;
+        pctx->set_debug_callback = v3d_set_debug_callback;
         pctx->invalidate_resource = v3d_invalidate_resource;
 
         if (screen->devinfo.ver >= 41) {
diff --git a/src/gallium/drivers/v3d/v3d_context.h b/src/gallium/drivers/v3d/v3d_context.h
index 575b74f494..7f03836d9c 100644
--- a/src/gallium/drivers/v3d/v3d_context.h
+++ b/src/gallium/drivers/v3d/v3d_context.h
@@ -433,6 +433,7 @@ struct v3d_context {
         struct v3d_vertexbuf_stateobj vertexbuf;
         struct v3d_streamout_stateobj streamout;
         struct v3d_bo *current_oq;
+        struct pipe_debug_callback debug;
         /** @} */
 };