radeonsi: save the contents of indirect buffers for debug contexts

This will be used by the IB parser.

Acked-by: Christian König <christian.koenig@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/src/gallium/drivers/radeonsi/si_hw_context.c b/src/gallium/drivers/radeonsi/si_hw_context.c
index 307dc391431950c71cdf9f24d91c6cd1d6f919a2..f848c648946afcc272bd472d62cbc25b7ff60665 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_hw_context.c
+++ b/src/gallium/drivers/radeonsi/si_hw_context.c
@@ -130,6 +130,14 @@ void si_context_gfx_flush(void *context, unsigned flags,
        /* force to keep tiling flags */
        flags |= RADEON_FLUSH_KEEP_TILING_FLAGS;
 
+       /* Save the IB for debug contexts. */
+       if (ctx->is_debug) {
+               free(ctx->last_ib);
+               ctx->last_ib_dw_size = cs->cdw;
+               ctx->last_ib = malloc(cs->cdw * 4);
+               memcpy(ctx->last_ib, cs->buf, cs->cdw * 4);
+       }
+
        /* Flush the CS. */
        ws->cs_flush(cs, flags, &ctx->last_gfx_fence,
                     ctx->screen->b.cs_count++);

diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index f6d4a5a9fb83c2d06a0ade712040f7872e44f86d..e5900b748067241ea16bb001345bcdbd133e618f 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -81,6 +81,7 @@ static void si_destroy_context(struct pipe_context *context)
        LLVMDisposeTargetMachine(sctx->tm);
 #endif
 
+       free(sctx->last_ib);
        FREE(sctx);
 }
 
@@ -112,6 +113,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
        sctx->b.b.destroy = si_destroy_context;
        sctx->b.set_atom_dirty = (void *)si_set_atom_dirty;
        sctx->screen = sscreen; /* Easy accessing of screen/winsys. */
+       sctx->is_debug = (flags & PIPE_CONTEXT_DEBUG) != 0;
 
        if (!r600_common_context_init(&sctx->b, &sscreen->b))
                goto fail;

diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index 3ab95385d8e294b772977de53cd3cc62757dd6ac..3672fec33a33344c26bbe7e8807b5c690aa6361e 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -243,6 +243,11 @@ struct si_context {
        struct si_shader_selector *last_tcs;
        int                     last_num_tcs_input_cp;
        int                     last_tes_sh_base;
+
+       /* Debug state. */
+       bool                    is_debug;
+       uint32_t                *last_ib;
+       unsigned                last_ib_dw_size;
 };
 
 /* cik_sdma.c */