From: Tom Stellard <thomas.stellard@amd.com>
Date: Thu, 18 Apr 2013 18:24:48 +0000 (-0700)
Subject: r600g: Fix build with --enable-opencl
X-Git-Tag: mesa-9.2.1~1690
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3b20170b2fb74a45031bf1e41d5149d2b3d4f2bf;p=platform%2Fupstream%2Fmesa.git

r600g: Fix build with --enable-opencl
---

diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index 465186d..2907c7c 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -273,12 +273,13 @@ int r600_compute_shader_create(struct pipe_context * ctx,
 	struct r600_shader_ctx shader_ctx;
 	bool dump = (r600_ctx->screen->debug_flags & DBG_CS) != 0;
 
-	r600_llvm_compile(mod, &bytes, &byte_count, r600_ctx->family , dump);
 	shader_ctx.bc = bytecode;
 	r600_bytecode_init(shader_ctx.bc, r600_ctx->chip_class, r600_ctx->family,
 			   r600_ctx->screen->msaa_texture_support);
 	shader_ctx.bc->type = TGSI_PROCESSOR_COMPUTE;
 	shader_ctx.bc->isa = r600_ctx->isa;
+	r600_llvm_compile(mod, &bytes, &byte_count, r600_ctx->family,
+				&shader_ctx.bc->ngpr, dump);
 	r600_bytecode_from_byte_stream(&shader_ctx, bytes, byte_count);
 	if (shader_ctx.bc->chip_class == CAYMAN) {
 		cm_bytecode_add_cf_end(shader_ctx.bc);