From fb28bf23db00d16b1b060c732e71e665a36c190b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 13 Jun 2018 22:31:21 -0400 Subject: [PATCH] radeonsi: remove references to Evergreen --- src/gallium/drivers/radeonsi/si_compute.c | 1 - src/gallium/drivers/radeonsi/si_dma_cs.c | 2 +- src/gallium/drivers/radeonsi/si_query.c | 1 - src/gallium/drivers/radeonsi/si_texture.c | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c index c8f864760f6..5a58fe4ac4f 100644 --- a/src/gallium/drivers/radeonsi/si_compute.c +++ b/src/gallium/drivers/radeonsi/si_compute.c @@ -957,7 +957,6 @@ void si_init_compute_functions(struct si_context *sctx) sctx->b.create_compute_state = si_create_compute_state; sctx->b.delete_compute_state = si_delete_compute_state; sctx->b.bind_compute_state = si_bind_compute_state; -/* ctx->context.create_sampler_view = evergreen_compute_create_sampler_view; */ sctx->b.set_compute_resources = si_set_compute_resources; sctx->b.set_global_binding = si_set_global_binding; sctx->b.launch_grid = si_launch_grid; diff --git a/src/gallium/drivers/radeonsi/si_dma_cs.c b/src/gallium/drivers/radeonsi/si_dma_cs.c index a0dec39b6bb..0308112cbb4 100644 --- a/src/gallium/drivers/radeonsi/si_dma_cs.c +++ b/src/gallium/drivers/radeonsi/si_dma_cs.c @@ -28,7 +28,7 @@ static void si_dma_emit_wait_idle(struct si_context *sctx) { struct radeon_cmdbuf *cs = sctx->dma_cs; - /* NOP waits for idle on Evergreen and later. */ + /* NOP waits for idle. */ if (sctx->chip_class >= CIK) radeon_emit(cs, 0x00000000); /* NOP */ else diff --git a/src/gallium/drivers/radeonsi/si_query.c b/src/gallium/drivers/radeonsi/si_query.c index 5458e6260fc..e29ce7150bd 100644 --- a/src/gallium/drivers/radeonsi/si_query.c +++ b/src/gallium/drivers/radeonsi/si_query.c @@ -1182,7 +1182,6 @@ static void si_get_hw_query_params(struct si_context *sctx, break; case PIPE_QUERY_PIPELINE_STATISTICS: { - /* Offsets apply to EG+ */ static const unsigned offsets[] = {56, 48, 24, 32, 40, 16, 8, 0, 64, 72, 80}; params->start_offset = offsets[index]; params->end_offset = 88 + offsets[index]; diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c index 22114fdb744..bbfac7cc4be 100644 --- a/src/gallium/drivers/radeonsi/si_texture.c +++ b/src/gallium/drivers/radeonsi/si_texture.c @@ -240,7 +240,7 @@ static int si_init_surface(struct si_screen *sscreen, if (!is_flushed_depth && ptex->format == PIPE_FORMAT_Z32_FLOAT_S8X24_UINT) { - bpe = 4; /* stencil is allocated separately on evergreen */ + bpe = 4; /* stencil is allocated separately */ } else { bpe = util_format_get_blocksize(ptex->format); assert(util_is_power_of_two_or_zero(bpe)); -- 2.30.2