diff options
author | Marek Olšák <[email protected]> | 2014-01-22 02:02:18 +0100 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2014-01-28 01:39:42 +0100 |
commit | a4c218f398a6176f2ecbe7e295020d348670a957 (patch) | |
tree | da191a95391994e2c698c04451ff5d76c8277c17 /src/gallium/drivers/r600/r600_hw_context.c | |
parent | ba0c16f7b2283db9dbeef036cf54dd6b694e4eaa (diff) |
r600g,radeonsi: consolidate variables for CS tracing
Reviewed-by: Michel Dänzer <[email protected]>
Reviewed-by: Tom Stellard <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_hw_context.c')
-rw-r--r-- | src/gallium/drivers/r600/r600_hw_context.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c index d6b0280affa..9b0c558c29e 100644 --- a/src/gallium/drivers/r600/r600_hw_context.c +++ b/src/gallium/drivers/r600/r600_hw_context.c @@ -54,7 +54,7 @@ void r600_need_cs_space(struct r600_context *ctx, unsigned num_dw, for (i = 0; i < R600_NUM_ATOMS; i++) { if (ctx->atoms[i] && ctx->atoms[i]->dirty) { num_dw += ctx->atoms[i]->num_dw; - if (ctx->screen->trace_bo) { + if (ctx->screen->b.trace_bo) { num_dw += R600_TRACE_CS_DWORDS; } } @@ -62,7 +62,7 @@ void r600_need_cs_space(struct r600_context *ctx, unsigned num_dw, /* The upper-bound of how much space a draw command would take. */ num_dw += R600_MAX_FLUSH_CS_DWORDS + R600_MAX_DRAW_CS_DWORDS; - if (ctx->screen->trace_bo) { + if (ctx->screen->b.trace_bo) { num_dw += R600_TRACE_CS_DWORDS; } } @@ -270,7 +270,7 @@ void r600_context_flush(struct r600_context *ctx, unsigned flags) } /* Flush the CS. */ - ctx->b.ws->cs_flush(ctx->b.rings.gfx.cs, flags, ctx->screen->cs_count++); + ctx->b.ws->cs_flush(ctx->b.rings.gfx.cs, flags, ctx->screen->b.cs_count++); } void r600_begin_new_cs(struct r600_context *ctx) |