r600g,radeonsi: consolidate remaining obviously duplicated pipe_screen code

Reviewed-by: Michel Dänzer <[email protected]>
Reviewed-by: Tom Stellard <[email protected]>

1 files changed, 1 insertions, 25 deletions

diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 941e6dec488..79a99f14fe7 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -418,17 +418,7 @@ static void si_destroy_screen(struct pipe_screen* pscreen)
 	if (!radeon_winsys_unref(sscreen->b.ws))
 		return;
 
-	r600_common_screen_cleanup(&sscreen->b);
-
-#if SI_TRACE_CS
-	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
-
-	sscreen->b.ws->destroy(sscreen->b.ws);
-	FREE(sscreen);
+	r600_destroy_common_screen(&sscreen->b);
 }
 
 struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws)
@@ -456,20 +446,6 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws)
 	if (debug_get_bool_option("RADEON_DUMP_SHADERS", FALSE))
 		sscreen->b.debug_flags |= DBG_FS | DBG_VS | DBG_GS | DBG_PS | DBG_CS;
 
-#if SI_TRACE_CS
-	sscreen->b.cs_count = 0;
-	if (sscreen->info.drm_minor >= 28) {
-		sscreen->b.trace_bo = (struct r600_resource*)pipe_buffer_create(&sscreen->screen,
-										PIPE_BIND_CUSTOM,
-										PIPE_USAGE_STAGING,
-										4096);
-		if (sscreen->b.trace_bo) {
-			sscreen->b.trace_ptr = sscreen->ws->buffer_map(sscreen->b.trace_bo->cs_buf, NULL,
-									PIPE_TRANSFER_UNSYNCHRONIZED);
-		}
-	}
-#endif
-
 	/* Create the auxiliary context. This must be done last. */
 	sscreen->b.aux_context = sscreen->b.b.context_create(&sscreen->b.b, NULL);