summaryrefslogtreecommitdiffstats
path: root/src/mesa/program
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2015-11-14 08:23:27 -0800
committerJason Ekstrand <[email protected]>2015-11-14 08:23:27 -0800
commitb5d4027c356f177f82c9ec52c138e7f85f3dbe95 (patch)
tree565f1e6cdfe425f55c30778ec5969596ba7f6219 /src/mesa/program
parent1469ccb7464836c752fa2664c36d8fae7e80606c (diff)
parentc7d504ad937b084a345fd6252784435d451ab03e (diff)
Merge branch 'wip/i965-separate-sampler-tex' into vulkan
Diffstat (limited to 'src/mesa/program')
-rw-r--r--src/mesa/program/prog_to_nir.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/program/prog_to_nir.c b/src/mesa/program/prog_to_nir.c
index 539e3c05312..d5386ee70e8 100644
--- a/src/mesa/program/prog_to_nir.c
+++ b/src/mesa/program/prog_to_nir.c
@@ -609,6 +609,7 @@ ptn_tex(nir_builder *b, nir_alu_dest dest, nir_ssa_def **src,
instr->op = op;
instr->dest_type = nir_type_float;
instr->is_shadow = prog_inst->TexShadow;
+ instr->texture_index = prog_inst->TexSrcUnit;
instr->sampler_index = prog_inst->TexSrcUnit;
switch (prog_inst->TexSrcTarget) {