summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2015-08-20 19:59:04 -0400
committerEmil Velikov <emil.l.velikov@gmail.com>2015-09-02 21:06:35 +0100
commitcc2226214db0550961989b616f5fb88db34e9afe (patch)
tree34c15448f68418842c3b993ef0a9e6098d44f900
parent5ab8bd7d99a2f8e235b1a02b92847cba55a13054 (diff)
st/mesa: fix assignments with 4-operand arguments (i.e. BFI)
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Cc: "10.6" <mesa-stable@lists.freedesktop.org> Reviewed-by: Marek Olšák <marek.olsak@amd.com> (cherry picked from commit 681efdf7a18b73ce06989cb2d3299e3feabdb5f5) [Emil Velikov: s/emit_asm/emit/] Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Conflicts: src/mesa/state_tracker/st_glsl_to_tgsi.cpp
-rw-r--r--src/mesa/state_tracker/st_glsl_to_tgsi.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 719d08145ea..b4b66787a84 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -2679,7 +2679,7 @@ glsl_to_tgsi_visitor::visit(ir_assignment *ir)
*/
glsl_to_tgsi_instruction *inst, *new_inst;
inst = (glsl_to_tgsi_instruction *)this->instructions.get_tail();
- new_inst = emit(ir, inst->op, l, inst->src[0], inst->src[1], inst->src[2]);
+ new_inst = emit(ir, inst->op, l, inst->src[0], inst->src[1], inst->src[2], inst->src[3]);
new_inst->saturate = inst->saturate;
inst->dead_mask = inst->dst[0].writemask;
} else {