summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lejeune <[email protected]>2012-11-20 23:22:47 +0100
committerVincent Lejeune <[email protected]>2012-11-29 22:15:18 +0100
commit5fda2990aa1a52a11a87eeb5ccf914588e0afe21 (patch)
tree97e6203a2537531979b624d1e018126d83e1be1a
parent9ff6b528867a2ad16be44ed6d023069a9a924b8d (diff)
r600g: separate resource_id and sampler_id tex info in tgsi-to-llvm
Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
-rw-r--r--src/gallium/drivers/r600/r600_llvm.c3
1 files changed, 3 insertions, 0 deletions
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"
@@ -325,6 +326,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,
emit_data->inst->Texture.Texture);