summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlia Mirkin <[email protected]>2016-05-22 16:50:27 -0400
committerIlia Mirkin <[email protected]>2016-05-23 19:58:53 -0400
commit1e99a46b446522dbb12634139c2f2060d5dabf94 (patch)
tree1540f12b0a54b09e9665cedac059398f1ee4e941
parent533d1e90853448c874a3aa85f91bceded47ed052 (diff)
st/mesa: update inst->info along with inst->op
Otherwise we still have TGSI_OPCODE_CMP's info, which causes a number of later logic to go wrong. This fixes dEQP-GLES2.functional.shaders.functions.control_flow.return_in_if_vertex on nv30. Signed-off-by: Ilia Mirkin <[email protected]> Reviewed-by: Marek Olšák <[email protected]>
-rw-r--r--src/mesa/state_tracker/st_glsl_to_tgsi.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 9d2057e6383..aa443a556fb 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -4459,6 +4459,7 @@ glsl_to_tgsi_visitor::simplify_cmp(void)
&& inst->dst[0].writemask == get_src_arg_mask(inst->dst[0], inst->src[2])) {
inst->op = TGSI_OPCODE_MOV;
+ inst->info = tgsi_get_opcode_info(inst->op);
inst->src[0] = inst->src[1];
}
}