diff --git a/src/gallium/drivers/radeonsi/meson.build b/src/gallium/drivers/radeonsi/meson.build index e4974368ac4..1801501949c 100644 --- a/src/gallium/drivers/radeonsi/meson.build +++ b/src/gallium/drivers/radeonsi/meson.build @@ -68,7 +68,7 @@ files_libradeonsi = files( 'si_state_shaders.cpp', 'si_state_streamout.c', 'si_state_viewport.c', - 'si_test_blit.c', + 'si_test_image_copy_region.c', 'si_test_dma_perf.c', 'si_texture.c', 'si_uvd.c', diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 0d30845366b..6ed57f84a8c 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -123,7 +123,7 @@ static const struct debug_named_value radeonsi_debug_options[] = { static const struct debug_named_value test_options[] = { /* Tests: */ - {"blit", DBG(TEST_BLIT), "Invoke blit tests and exit."}, + {"imagecopy", DBG(TEST_IMAGE_COPY), "Invoke resource_copy_region tests with images and exit."}, {"testvmfaultcp", DBG(TEST_VMFAULT_CP), "Invoke a CP VM fault test and exit."}, {"testvmfaultshader", DBG(TEST_VMFAULT_SHADER), "Invoke a shader VM fault test and exit."}, {"testdmaperf", DBG(TEST_DMA_PERF), "Test DMA performance"}, @@ -1382,8 +1382,8 @@ static struct pipe_screen *radeonsi_screen_create_impl(struct radeon_winsys *ws, sscreen->aux_context->set_log_context(sscreen->aux_context, log); } - if (test_flags & DBG(TEST_BLIT)) - si_test_blit(sscreen); + if (test_flags & DBG(TEST_IMAGE_COPY)) + si_test_image_copy_region(sscreen); if (test_flags & DBG(TEST_DMA_PERF)) { si_test_dma_perf(sscreen); diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index d28a48bc16a..0dc098e10cf 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -255,7 +255,7 @@ enum enum { /* Tests: */ - DBG_TEST_BLIT, + DBG_TEST_IMAGE_COPY, DBG_TEST_VMFAULT_CP, DBG_TEST_VMFAULT_SHADER, DBG_TEST_DMA_PERF, @@ -1541,8 +1541,8 @@ void *gfx10_create_sh_query_result_cs(struct si_context *sctx); void gfx10_init_query(struct si_context *sctx); void gfx10_destroy_query(struct si_context *sctx); -/* si_test_blit.c */ -void si_test_blit(struct si_screen *sscreen); +/* si_test_image_copy_region.c */ +void si_test_image_copy_region(struct si_screen *sscreen); /* si_test_clearbuffer.c */ void si_test_dma_perf(struct si_screen *sscreen); diff --git a/src/gallium/drivers/radeonsi/si_test_blit.c b/src/gallium/drivers/radeonsi/si_test_image_copy_region.c similarity index 99% rename from src/gallium/drivers/radeonsi/si_test_blit.c rename to src/gallium/drivers/radeonsi/si_test_image_copy_region.c index 74a45f7783b..e4936be4fbe 100644 --- a/src/gallium/drivers/radeonsi/si_test_blit.c +++ b/src/gallium/drivers/radeonsi/si_test_image_copy_region.c @@ -168,7 +168,7 @@ static unsigned generate_max_tex_side(unsigned max_tex_side) } } -void si_test_blit(struct si_screen *sscreen) +void si_test_image_copy_region(struct si_screen *sscreen) { struct pipe_screen *screen = &sscreen->b; struct pipe_context *ctx = screen->context_create(screen, NULL, 0);