Mesa (master): Revert "st/glsl_to_tgsi: don' t increase immediate index by 1."

[Dave Airlie]

Module: Mesa
Branch: master
Commit: cb728df9670d8399479db8502145bbc6f653cfb3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb728df9670d8399479db8502145bbc6f653cfb3

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Jul  5 10:22:21 2016 +1000

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 at arb_gpu_shader_fp64@shader_storage at layout-std140-fp64-mixed-shader
on radeonsi

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

---

 src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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++;
 	       }