Mesa (master): r600g: Fix build failure introduced with r600_texture. c consolidation

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 868791f0baa0b51f4255c839448d3ca87ab1aa35
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=868791f0baa0b51f4255c839448d3ca87ab1aa35

Author: Laurent Carlier <lordheavym at gmail.com>
Date:   Sun Sep 29 21:45:09 2013 +0200

r600g: Fix build failure introduced with r600_texture.c consolidation

It seems that case with opencl enabled was forgotten

Signed-off-by: Marek Olšák <marek.olsak at amd.com>

---

 src/gallium/drivers/r600/evergreen_compute.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/r600/evergreen_compute.c b/src/gallium/drivers/r600/evergreen_compute.c
index 076c09c..3069236 100644
--- a/src/gallium/drivers/r600/evergreen_compute.c
+++ b/src/gallium/drivers/r600/evergreen_compute.c
@@ -532,10 +532,10 @@ static void evergreen_launch_grid(
 		struct r600_bytecode *bc = &kernel->bc;
 		LLVMModuleRef mod = kernel->llvm_module;
 		boolean use_kill = false;
-		bool dump = (ctx->screen->debug_flags & DBG_CS) != 0;
-		unsigned use_sb = ctx->screen->debug_flags & DBG_SB_CS;
+		bool dump = (ctx->screen->b.debug_flags & DBG_CS) != 0;
+		unsigned use_sb = ctx->screen->b.debug_flags & DBG_SB_CS;
 		unsigned sb_disasm = use_sb ||
-			(ctx->screen->debug_flags & DBG_SB_DISASM);
+			(ctx->screen->b.debug_flags & DBG_SB_DISASM);
 
 		r600_bytecode_init(bc, ctx->b.chip_class, ctx->b.family,
 			   ctx->screen->has_compressed_msaa_texturing);
@@ -552,7 +552,7 @@ static void evergreen_launch_grid(
 
 		kernel->code_bo = r600_compute_buffer_alloc_vram(ctx->screen,
 							kernel->bc.ndw * 4);
-		p = r600_buffer_mmap_sync_with_rings(ctx, kernel->code_bo, PIPE_TRANSFER_WRITE);
+		p = r600_buffer_map_sync_with_rings(&ctx->b, kernel->code_bo, PIPE_TRANSFER_WRITE);
 		memcpy(p, kernel->bc.bytecode, kernel->bc.ndw * 4);
 		ctx->b.ws->buffer_unmap(kernel->code_bo->cs_buf);
 	}