From: Dave Airlie Date: Mon, 6 Jun 2016 23:39:55 +0000 (+1000) Subject: st/glsl_to_tgsi: don't increase immediate index by 1. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=27d456cc87a01998c6fe1dbf45937e2ca6128495;p=mesa.git st/glsl_to_tgsi: don't increase immediate index by 1. Immediates are stored into a separate table, and are consolidated, so if we get an immediate we don't need to offset it as the index it has is correct. Cc: "11.2 12.0" Signed-off-by: Dave Airlie --- diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 197b3af8c04..6d08c58a00d 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -816,7 +816,7 @@ glsl_to_tgsi_visitor::emit_asm(ir_instruction *ir, unsigned op, if (glsl_base_type_is_64bit(dinst->src[j].type)) { dinst->src[j].index = initial_src_idx[j]; - if (swz > 1) { + if (swz > 1 && dinst->src[j].file != PROGRAM_IMMEDIATE) { dinst->src[j].double_reg2 = true; dinst->src[j].index++; }