From: Vincent Lejeune <vljn@ovi.com>
Date: Tue, 20 Nov 2012 22:22:47 +0000 (+0100)
Subject: r600g: separate resource_id and sampler_id tex info in tgsi-to-llvm
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5fda2990aa1a52a11a87eeb5ccf914588e0afe21;p=mesa.git

r600g: separate resource_id and sampler_id tex info in tgsi-to-llvm

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

diff --git a/src/gallium/drivers/r600/r600_llvm.c b/src/gallium/drivers/r600/r600_llvm.c
index b3d4e6bab68..8f1ed26b4c6 100644
--- a/src/gallium/drivers/r600/r600_llvm.c
+++ b/src/gallium/drivers/r600/r600_llvm.c
@@ -11,6 +11,7 @@
 #include "r600_asm.h"
 #include "r600_opcodes.h"
 #include "r600_shader.h"
+#include "r600_pipe.h"
 #include "radeon_llvm.h"
 #include "radeon_llvm_emit.h"
 
@@ -324,6 +325,8 @@ static void llvm_emit_tex(
 
 	sampler_src = emit_data->inst->Instruction.NumSrcRegs-1;
 
+	args[c++] = lp_build_const_int32(gallivm,
+					emit_data->inst->Src[sampler_src].Register.Index + R600_MAX_CONST_BUFFERS);
 	args[c++] = lp_build_const_int32(gallivm,
 					emit_data->inst->Src[sampler_src].Register.Index);
 	args[c++] = lp_build_const_int32(gallivm,