[Mesa-dev] [PATCH 0/6] radeonsi: Minor cleanups and improvements

[Tom Stellard]

On Wed, Aug 28, 2013 at 07:17:30PM +0200, Marek Olšák wrote:
> This series contains the changes my transform feedback work depends on, but there are some useful fixes too, making it worth comitting earlier.
> 
> The last patch is the most important one, because it fixes the issues we had with the emission of resource descriptors that we had to use 256 resource contexts as a workaround. Further testing has shown that even 256 wasn't enough. With that patch, we only need 8 or 16 contexts as originally expected.
> 
> I also made the first step towards sharing code between r600g and radeonsi and it's what made this series so big:
> 
> 54 files changed, 2448 insertions(+), 2532 deletions(-)
> 
> Please review.

With the attached build fix for r600g, there are no compute regressions
with this series with either r600g or radeonsi.

Tested-by: Tom Stellard <thomas.stellard at amd.com>

-Tom

> 
> Marek
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
-------------- next part --------------
>From bc0a95be23dc071e1676c82058ffaeb92208c6d7 Mon Sep 17 00:00:00 2001
From: Tom Stellard <thomas.stellard at amd.com>
Date: Thu, 29 Aug 2013 17:46:27 -0400
Subject: [PATCH] r600g/compute: Fix build since state changes

---
 src/gallium/drivers/r600/evergreen_compute.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/r600/evergreen_compute.c b/src/gallium/drivers/r600/evergreen_compute.c
index 20bccbe..fbbc4fd 100644
--- a/src/gallium/drivers/r600/evergreen_compute.c
+++ b/src/gallium/drivers/r600/evergreen_compute.c
@@ -546,11 +546,11 @@ static void evergreen_launch_grid(
 		unsigned sb_disasm = use_sb ||
 			(ctx->screen->debug_flags & DBG_SB_DISASM);
 
-		r600_bytecode_init(bc, ctx->chip_class, ctx->family,
+		r600_bytecode_init(bc, ctx->b.chip_class, ctx->b.family,
 			   ctx->screen->has_compressed_msaa_texturing);
 		bc->type = TGSI_PROCESSOR_COMPUTE;
 		bc->isa = ctx->isa;
-		r600_llvm_compile(mod, ctx->family, bc, &use_kill, dump);
+		r600_llvm_compile(mod, ctx->b.family, bc, &use_kill, dump);
 
 		if (dump && !sb_disasm) {
 			r600_bytecode_disasm(bc);
@@ -563,7 +563,7 @@ static void evergreen_launch_grid(
 							kernel->bc.ndw * 4);
 		p = r600_buffer_mmap_sync_with_rings(ctx, kernel->code_bo, PIPE_TRANSFER_WRITE);
 		memcpy(p, kernel->bc.bytecode, kernel->bc.ndw * 4);
-		ctx->ws->buffer_unmap(kernel->code_bo->cs_buf);
+		ctx->b.ws->buffer_unmap(kernel->code_bo->cs_buf);
 	}
 #endif
 	shader->active_kernel = kernel;
-- 
1.8.1.5