From: Dave Airlie <airlied@redhat.com>
Date: Tue, 5 Jul 2016 00:22:21 +0000 (+1000)
Subject: Revert "st/glsl_to_tgsi: don't increase immediate index by 1."
X-Git-Tag: upstream/17.1.0~8298
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cb728df9670d8399479db8502145bbc6f653cfb3;p=platform%2Fupstream%2Fmesa.git

Revert "st/glsl_to_tgsi: don't increase immediate index by 1."

This reverts commit 27d456cc87a01998c6fe1dbf45937e2ca6128495.

DOH, what seems right and what is right with fp64 are always
two different things.

This regressed:
spec@arb_gpu_shader_fp64@shader_storage@layout-std140-fp64-mixed-shader
on radeonsi

Reported-by: Michel Dänzer <michel@daenzer.net>
Cc: "11.2 12.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 6d08c58..197b3af 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 && dinst->src[j].file != PROGRAM_IMMEDIATE) {
+               if (swz > 1) {
                   dinst->src[j].double_reg2 = true;
                   dinst->src[j].index++;
 	       }