From ea5c54a1d355e2bd98216aabc8761f85bc96df50 Mon Sep 17 00:00:00 2001
From: pineappleEA <pineaea@gmail.com>
Date: Sat, 21 Aug 2021 22:39:45 +0200
Subject: [PATCH] early-access version 2007

---
 README.md                                                   | 2 +-
 src/common/settings.h                                       | 2 +-
 .../frontend/maxwell/translate_program.cpp                  | 6 ++++--
 src/shader_recompiler/host_translate_info.h                 | 5 +++--
 src/video_core/renderer_opengl/gl_device.h                  | 4 ++++
 src/video_core/renderer_opengl/gl_shader_cache.cpp          | 1 +
 src/video_core/renderer_vulkan/vk_pipeline_cache.cpp        | 1 +
 7 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 11cd2702d..530bdb48b 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 2006.
+This is the source code for early-access 2007.
 
 ## Legal Notice
 
diff --git a/src/common/settings.h b/src/common/settings.h
index 35d467b4a..ce8b1f473 100755
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -495,7 +495,7 @@ struct Values {
     std::chrono::seconds custom_rtc_differential;
 
     BasicSetting<s32> current_user{0, "current_user"};
-    RangedSetting<s32> language_index{1, 0, 16, "language_index"};
+    RangedSetting<s32> language_index{1, 0, 17, "language_index"};
     RangedSetting<s32> region_index{1, 0, 6, "region_index"};
     RangedSetting<s32> time_zone_index{0, 0, 45, "time_zone_index"};
     RangedSetting<s32> sound_index{1, 0, 2, "sound_index"};
diff --git a/src/shader_recompiler/frontend/maxwell/translate_program.cpp b/src/shader_recompiler/frontend/maxwell/translate_program.cpp
index 727855774..b53073165 100755
--- a/src/shader_recompiler/frontend/maxwell/translate_program.cpp
+++ b/src/shader_recompiler/frontend/maxwell/translate_program.cpp
@@ -178,11 +178,13 @@ IR::Program TranslateProgram(ObjectPool<IR::Inst>& inst_pool, ObjectPool<IR::Blo
 
     Optimization::ConstantPropagationPass(program);
     Optimization::DeadCodeEliminationPass(program);
-    Optimization::GetAttributeReorderPass(program);
+    Optimization::CollectShaderInfoPass(env, program);
+    if (program.info.uses_demote_to_helper_invocation) {
+        Optimization::GetAttributeReorderPass(program);
+    }
     if (Settings::values.renderer_debug) {
         Optimization::VerificationPass(program);
     }
-    Optimization::CollectShaderInfoPass(env, program);
     CollectInterpolationInfo(env, program);
     AddNVNStorageBuffers(program);
     return program;
diff --git a/src/shader_recompiler/host_translate_info.h b/src/shader_recompiler/host_translate_info.h
index 94a584219..d0c0507a8 100755
--- a/src/shader_recompiler/host_translate_info.h
+++ b/src/shader_recompiler/host_translate_info.h
@@ -11,8 +11,9 @@ namespace Shader {
 
 /// Misc information about the host
 struct HostTranslateInfo {
-    bool support_float16{}; ///< True when the device supports 16-bit floats
-    bool support_int64{};   ///< True when the device supports 64-bit integers
+    bool support_float16{};             ///< True when the device supports 16-bit floats
+    bool support_int64{};               ///< True when the device supports 64-bit integers
+    bool needs_get_attribute_reorder{}; ///< True when the device needs GetAttribute reordered
 };
 
 } // namespace Shader
diff --git a/src/video_core/renderer_opengl/gl_device.h b/src/video_core/renderer_opengl/gl_device.h
index ee992aed4..de9e41659 100755
--- a/src/video_core/renderer_opengl/gl_device.h
+++ b/src/video_core/renderer_opengl/gl_device.h
@@ -156,6 +156,10 @@ public:
         return shader_backend;
     }
 
+    bool IsAmd() const {
+        return vendor_name == "ATI Technologies Inc.";
+    }
+
 private:
     static bool TestVariableAoffi();
     static bool TestPreciseBug();
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp
index 1f4dda17e..371db6d63 100755
--- a/src/video_core/renderer_opengl/gl_shader_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp
@@ -219,6 +219,7 @@ ShaderCache::ShaderCache(RasterizerOpenGL& rasterizer_, Core::Frontend::EmuWindo
       host_info{
           .support_float16 = false,
           .support_int64 = device.HasShaderInt64(),
+          .needs_get_attribute_reorder = device.IsAmd(),
       } {
     if (use_asynchronous_shaders) {
         workers = CreateWorkers();
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
index a37ca1fdf..d1a402547 100755
--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
@@ -325,6 +325,7 @@ PipelineCache::PipelineCache(RasterizerVulkan& rasterizer_, Tegra::Engines::Maxw
     host_info = Shader::HostTranslateInfo{
         .support_float16 = device.IsFloat16Supported(),
         .support_int64 = device.IsShaderInt64Supported(),
+        .needs_get_attribute_reorder = driver_id == VK_DRIVER_ID_AMD_PROPRIETARY_KHR,
     };
 }