From 06bfb2d28f7adca7edc6be9c210a7a3583023652 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Wed, 13 Sep 2017 02:26:26 +0200 Subject: r600: fork and import gallium/radeon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This marks the end of code sharing between r600 and radeonsi. It's getting difficult to work on radeonsi without breaking r600. A lot of functions had to be renamed to prevent linker conflicts. There are also minor cleanups. Acked-by: Dave Airlie Reviewed-by: Nicolai Hähnle --- src/gallium/drivers/radeonsi/si_compute.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gallium/drivers/radeonsi/si_compute.c') diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c index ca334949d77..3987eecca8e 100644 --- a/src/gallium/drivers/radeonsi/si_compute.c +++ b/src/gallium/drivers/radeonsi/si_compute.c @@ -175,7 +175,7 @@ static void *si_create_compute_state( if ((sctx->b.debug.debug_message && !sctx->b.debug.async) || sctx->is_debug || - r600_can_dump_shader(&sscreen->b, PIPE_SHADER_COMPUTE)) + si_can_dump_shader(&sscreen->b, PIPE_SHADER_COMPUTE)) si_create_compute_state_async(program, -1); else util_queue_add_job(&sscreen->shader_compiler_queue, @@ -328,7 +328,7 @@ static bool si_setup_compute_scratch_buffer(struct si_context *sctx, r600_resource_reference(&sctx->compute_scratch_buffer, NULL); sctx->compute_scratch_buffer = (struct r600_resource*) - r600_aligned_buffer_create(&sctx->screen->b.b, + si_aligned_buffer_create(&sctx->screen->b.b, R600_RESOURCE_FLAG_UNMAPPABLE, PIPE_USAGE_DEFAULT, scratch_needed, 256); -- cgit v1.2.3