From 1e99a46b446522dbb12634139c2f2060d5dabf94 Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Sun, 22 May 2016 16:50:27 -0400 Subject: [PATCH] st/mesa: update inst->info along with inst->op MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Marek Olšák --- src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 1 + 1 file changed, 1 insertion(+) 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]; } } -- 2.30.2