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/radeonsi/si_pipe.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/radeonsi/si_pipe.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_pipe.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 8666b5b071c..6aaf59568c4 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -564,9 +564,9 @@ static void si_destroy_screen(struct pipe_screen* pscreen) r600_common_screen_cleanup(&sscreen->b); #if SI_TRACE_CS - if (sscreen->trace_bo) { - sscreen->ws->buffer_unmap(sscreen->trace_bo->cs_buf); - pipe_resource_reference((struct pipe_resource**)&sscreen->trace_bo, NULL); + if (sscreen->b.trace_bo) { + sscreen->ws->buffer_unmap(sscreen->b.trace_bo->cs_buf); + pipe_resource_reference((struct pipe_resource**)&sscreen->b.trace_bo, NULL); } #endif @@ -611,14 +611,14 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws) sscreen->b.debug_flags |= DBG_FS | DBG_VS | DBG_GS | DBG_PS | DBG_CS; #if SI_TRACE_CS - sscreen->cs_count = 0; + sscreen->b.cs_count = 0; if (sscreen->info.drm_minor >= 28) { - sscreen->trace_bo = (struct r600_resource*)pipe_buffer_create(&sscreen->screen, + sscreen->b.trace_bo = (struct r600_resource*)pipe_buffer_create(&sscreen->screen, PIPE_BIND_CUSTOM, PIPE_USAGE_STAGING, 4096); - if (sscreen->trace_bo) { - sscreen->trace_ptr = sscreen->ws->buffer_map(sscreen->trace_bo->cs_buf, NULL, + if (sscreen->b.trace_bo) { + sscreen->b.trace_ptr = sscreen->ws->buffer_map(sscreen->b.trace_bo->cs_buf, NULL, PIPE_TRANSFER_UNSYNCHRONIZED); } } |