From 981eb6f43bb88f1e57b4c657bf37cb7471a113e3 Mon Sep 17 00:00:00 2001
From: FernandoS27 <fsahmkow27@gmail.com>
Date: Fri, 26 Mar 2021 01:54:03 +0100
Subject: [PATCH] shader: Fix Array Indices in TEX/TLD4

---
 .../frontend/maxwell/translate/impl/texture_fetch.cpp       | 6 +++---
 .../frontend/maxwell/translate/impl/texture_gather.cpp      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/shader_recompiler/frontend/maxwell/translate/impl/texture_fetch.cpp b/src/shader_recompiler/frontend/maxwell/translate/impl/texture_fetch.cpp
index d2626f3e7..1f1689c43 100644
--- a/src/shader_recompiler/frontend/maxwell/translate/impl/texture_fetch.cpp
+++ b/src/shader_recompiler/frontend/maxwell/translate/impl/texture_fetch.cpp
@@ -61,11 +61,11 @@ IR::Value MakeCoords(TranslatorVisitor& v, IR::Reg reg, TextureType type) {
     case TextureType::_1D:
         return v.F(reg);
     case TextureType::ARRAY_1D:
-        return v.ir.CompositeConstruct(read_array(), v.F(reg + 1));
+        return v.ir.CompositeConstruct(v.F(reg + 1), read_array());
     case TextureType::_2D:
         return v.ir.CompositeConstruct(v.F(reg), v.F(reg + 1));
     case TextureType::ARRAY_2D:
-        return v.ir.CompositeConstruct(read_array(), v.F(reg + 1), v.F(reg + 2));
+        return v.ir.CompositeConstruct(v.F(reg + 1), v.F(reg + 2), read_array());
     case TextureType::_3D:
         return v.ir.CompositeConstruct(v.F(reg), v.F(reg + 1), v.F(reg + 2));
     case TextureType::ARRAY_3D:
@@ -73,7 +73,7 @@ IR::Value MakeCoords(TranslatorVisitor& v, IR::Reg reg, TextureType type) {
     case TextureType::CUBE:
         return v.ir.CompositeConstruct(v.F(reg), v.F(reg + 1), v.F(reg + 2));
     case TextureType::ARRAY_CUBE:
-        return v.ir.CompositeConstruct(read_array(), v.F(reg + 1), v.F(reg + 2), v.F(reg + 3));
+        return v.ir.CompositeConstruct(v.F(reg + 1), v.F(reg + 2), v.F(reg + 3), read_array());
     }
     throw NotImplementedException("Invalid texture type {}", type);
 }
diff --git a/src/shader_recompiler/frontend/maxwell/translate/impl/texture_gather.cpp b/src/shader_recompiler/frontend/maxwell/translate/impl/texture_gather.cpp
index d64865876..8c6384040 100644
--- a/src/shader_recompiler/frontend/maxwell/translate/impl/texture_gather.cpp
+++ b/src/shader_recompiler/frontend/maxwell/translate/impl/texture_gather.cpp
@@ -65,11 +65,11 @@ IR::Value MakeCoords(TranslatorVisitor& v, IR::Reg reg, TextureType type) {
     case TextureType::_1D:
         return v.F(reg);
     case TextureType::ARRAY_1D:
-        return v.ir.CompositeConstruct(read_array(), v.F(reg + 1));
+        return v.ir.CompositeConstruct(v.F(reg + 1), read_array());
     case TextureType::_2D:
         return v.ir.CompositeConstruct(v.F(reg), v.F(reg + 1));
     case TextureType::ARRAY_2D:
-        return v.ir.CompositeConstruct(read_array(), v.F(reg + 1), v.F(reg + 2));
+        return v.ir.CompositeConstruct(v.F(reg + 1), v.F(reg + 2), read_array());
     case TextureType::_3D:
         return v.ir.CompositeConstruct(v.F(reg), v.F(reg + 1), v.F(reg + 2));
     case TextureType::ARRAY_3D:
@@ -77,7 +77,7 @@ IR::Value MakeCoords(TranslatorVisitor& v, IR::Reg reg, TextureType type) {
     case TextureType::CUBE:
         return v.ir.CompositeConstruct(v.F(reg), v.F(reg + 1), v.F(reg + 2));
     case TextureType::ARRAY_CUBE:
-        return v.ir.CompositeConstruct(read_array(), v.F(reg + 1), v.F(reg + 2), v.F(reg + 3));
+        return v.ir.CompositeConstruct(v.F(reg + 1), v.F(reg + 2), v.F(reg + 3), read_array());
     }
     throw NotImplementedException("Invalid texture type {}", type);
 }