shader: Address feedback

5 files changed, 42 insertions, 44 deletions

diff --git a/src/shader_recompiler/frontend/maxwell/control_flow.cpp b/src/shader_recompiler/frontend/maxwell/control_flow.cpp
index 298faa03e..e7abea82f 100644
--- a/src/shader_recompiler/frontend/maxwell/control_flow.cpp
+++ b/src/shader_recompiler/frontend/maxwell/control_flow.cpp
@@ -209,9 +209,9 @@ CFG::CFG(Environment& env_, ObjectPool<Block>& block_pool_, Location start_addre
         }
     }
     if (exits_to_dispatcher) {
-        const auto it = functions[0].blocks.rbegin();
-        dispatch_block->begin = it->end + 1;
-        dispatch_block->end = it->end + 1;
+        const auto last_block{functions[0].blocks.rbegin()};
+        dispatch_block->begin = last_block->end + 1;
+        dispatch_block->end = last_block->end + 1;
         functions[0].blocks.insert(*dispatch_block);
     }
 }
@@ -481,7 +481,7 @@ CFG::AnalysisState CFG::AnalyzeEXIT(Block* block, FunctionId function_id, Locati
         return AnalysisState::Continue;
     }
     if (exits_to_dispatcher && function_id != 0) {
-        throw NotImplementedException("Dispatch EXIT on external function.");
+        throw NotImplementedException("Dispatch EXIT on external function");
     }
     if (pred != Predicate{true} || flow_test != IR::FlowTest::T) {
         if (block->stack.Peek(Token::PEXIT).has_value()) {
@@ -490,9 +490,9 @@ CFG::AnalysisState CFG::AnalyzeEXIT(Block* block, FunctionId function_id, Locati
         const IR::Condition cond{flow_test, static_cast<IR::Pred>(pred.index), pred.negated};
         if (exits_to_dispatcher) {
             block->end = pc;
-            block->branch_true = dispatch_block;
             block->end_class = EndClass::Branch;
             block->cond = cond;
+            block->branch_true = dispatch_block;
             block->branch_false = AddLabel(block, block->stack, pc + 1, function_id);
             return AnalysisState::Branch;
         }
diff --git a/src/shader_recompiler/frontend/maxwell/program.cpp b/src/shader_recompiler/frontend/maxwell/program.cpp
index 59897cb3e..a4fa4319d 100644
--- a/src/shader_recompiler/frontend/maxwell/program.cpp
+++ b/src/shader_recompiler/frontend/maxwell/program.cpp
@@ -151,31 +151,30 @@ IR::Program TranslateProgram(ObjectPool<IR::Inst>& inst_pool, ObjectPool<IR::Blo
 }
 
 IR::Program MergeDualVertexPrograms(IR::Program& vertex_a, IR::Program& vertex_b,
-                                    Environment& env2) {
-    IR::Program program{};
+                                    Environment& env_vertex_b) {
+    IR::Program result{};
     Optimization::VertexATransformPass(vertex_a);
     Optimization::VertexBTransformPass(vertex_b);
-    program.blocks.swap(vertex_a.blocks);
+    std::swap(result.blocks, vertex_a.blocks);
     for (IR::Block* block : vertex_b.blocks) {
-        program.blocks.push_back(block);
+        result.blocks.push_back(block);
     }
-    program.stage = Stage::VertexB;
-    program.info = vertex_a.info;
-    program.local_memory_size = std::max(vertex_a.local_memory_size, vertex_b.local_memory_size);
+    result.stage = Stage::VertexB;
+    result.info = vertex_a.info;
+    result.local_memory_size = std::max(vertex_a.local_memory_size, vertex_b.local_memory_size);
 
-    for (size_t index = 0; index < 32; index++) {
-        program.info.input_generics[index].used |= vertex_b.info.input_generics[index].used;
-        program.info.stores_generics[index] |= vertex_b.info.stores_generics[index];
+    for (size_t index = 0; index < 32; ++index) {
+        result.info.input_generics[index].used |= vertex_b.info.input_generics[index].used;
+        result.info.stores_generics[index] |= vertex_b.info.stores_generics[index];
     }
-    Optimization::JoinTextureInfo(program.info, vertex_b.info);
-    Optimization::JoinStorageInfo(program.info, vertex_b.info);
-    Optimization::DualVertexJoinPass(program);
-    program.post_order_blocks = PostOrder(program.blocks);
-    Optimization::DeadCodeEliminationPass(program);
-    Optimization::IdentityRemovalPass(program);
-    Optimization::VerificationPass(program);
-    Optimization::CollectShaderInfoPass(env2, program);
-    return program;
+    Optimization::JoinTextureInfo(result.info, vertex_b.info);
+    Optimization::JoinStorageInfo(result.info, vertex_b.info);
+    Optimization::DualVertexJoinPass(result);
+    result.post_order_blocks = PostOrder(result.blocks);
+    Optimization::DeadCodeEliminationPass(result);
+    Optimization::VerificationPass(result);
+    Optimization::CollectShaderInfoPass(env_vertex_b, result);
+    return result;
 }
 
 } // namespace Shader::Maxwell
diff --git a/src/shader_recompiler/frontend/maxwell/program.h b/src/shader_recompiler/frontend/maxwell/program.h
index 6e5d5ddd0..f7f5930e4 100644
--- a/src/shader_recompiler/frontend/maxwell/program.h
+++ b/src/shader_recompiler/frontend/maxwell/program.h
@@ -23,4 +23,5 @@ namespace Shader::Maxwell {
 
 [[nodiscard]] IR::Program MergeDualVertexPrograms(IR::Program& vertex_a, IR::Program& vertex_b,
                                                   Environment& env_vertex_b);
+
 } // namespace Shader::Maxwell
diff --git a/src/shader_recompiler/ir_opt/dual_vertex_pass.cpp b/src/shader_recompiler/ir_opt/dual_vertex_pass.cpp
index f35c6478a..f2d7db0e6 100644
--- a/src/shader_recompiler/ir_opt/dual_vertex_pass.cpp
+++ b/src/shader_recompiler/ir_opt/dual_vertex_pass.cpp
@@ -4,8 +4,6 @@
 
 #include <algorithm>
 #include <ranges>
-#include <tuple>
-#include <type_traits>
 
 #include "common/bit_cast.h"
 #include "common/bit_util.h"
@@ -40,7 +38,7 @@ void VertexATransformPass(IR::Program& program) {
 }
 
 void VertexBTransformPass(IR::Program& program) {
-    for (IR::Block* const block : program.post_order_blocks | std::views::reverse) {
+    for (IR::Block* const block : program.blocks) {
         for (IR::Inst& inst : block->Instructions()) {
             if (inst.GetOpcode() == IR::Opcode::Prologue) {
                 return inst.Invalidate();
@@ -51,24 +49,24 @@ void VertexBTransformPass(IR::Program& program) {
 
 void DualVertexJoinPass(IR::Program& program) {
     const auto& blocks = program.blocks;
-    s64 s = static_cast<s64>(blocks.size()) - 1;
-    if (s < 1) {
-        throw NotImplementedException("Dual Vertex Join pass failed, expected atleast 2 blocks!");
+    const s64 sub_size = static_cast<s64>(blocks.size()) - 1;
+    if (sub_size < 1) {
+        throw LogicError("Dual Vertex Join pass failed, expected atleast 2 blocks");
     }
-    for (s64 index = 0; index < s; index++) {
-        IR::Block* const current_block = blocks[index];
-        IR::Block* const next_block = blocks[index + 1];
+    for (s64 index = 0; index < sub_size; ++index) {
+        IR::Block* const current_block{blocks[index]};
+        IR::Block* const next_block{blocks[index + 1]};
         for (IR::Inst& inst : current_block->Instructions()) {
             if (inst.GetOpcode() == IR::Opcode::Join) {
                 IR::IREmitter ir{*current_block, IR::Block::InstructionList::s_iterator_to(inst)};
                 ir.Branch(next_block);
                 inst.Invalidate();
-                // only 1 join should exist
+                // Only 1 join should exist
                 return;
             }
         }
     }
-    throw NotImplementedException("Dual Vertex Join pass failed, no join present!");
+    throw LogicError("Dual Vertex Join pass failed, no join present");
 }
 
 } // namespace Shader::Optimization
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
index 638475251..634bbb450 100644
--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
@@ -288,32 +288,32 @@ std::unique_ptr<GraphicsPipeline> PipelineCache::CreateGraphicsPipeline(
     LOG_INFO(Render_Vulkan, "0x{:016x}", key.Hash());
     size_t env_index{0};
     std::array<Shader::IR::Program, Maxwell::MaxShaderProgram> programs;
-    bool uses_vertex_a{};
-    std::size_t start_value_processing{};
+    const bool uses_vertex_a{key.unique_hashes[0] != 0};
+    const bool uses_vertex_b{key.unique_hashes[1] != 0};
     for (size_t index = 0; index < Maxwell::MaxShaderProgram; ++index) {
         if (key.unique_hashes[index] == 0) {
             continue;
         }
-        uses_vertex_a |= index == 0;
         Shader::Environment& env{*envs[env_index]};
         ++env_index;
 
         const u32 cfg_offset{static_cast<u32>(env.StartAddress() + sizeof(Shader::ProgramHeader))};
         Shader::Maxwell::Flow::CFG cfg(env, pools.flow_block, cfg_offset, index == 0);
         if (!uses_vertex_a || index != 1) {
+            // Normal path
             programs[index] = TranslateProgram(pools.inst, pools.block, env, cfg);
-            continue;
+        } else {
+            // VertexB path when VertexA is present.
+            Shader::IR::Program& program_va{programs[0]};
+            Shader::IR::Program program_vb{TranslateProgram(pools.inst, pools.block, env, cfg)};
+            programs[index] = MergeDualVertexPrograms(program_va, program_vb, env);
         }
-        Shader::IR::Program& program_va{programs[0]};
-        Shader::IR::Program program_vb{TranslateProgram(pools.inst, pools.block, env, cfg)};
-        programs[index] = MergeDualVertexPrograms(program_va, program_vb, env);
-        start_value_processing = 1;
     }
     std::array<const Shader::Info*, Maxwell::MaxShaderStage> infos{};
     std::array<vk::ShaderModule, Maxwell::MaxShaderStage> modules;
 
     u32 binding{0};
-    for (size_t index = start_value_processing; index < Maxwell::MaxShaderProgram; ++index) {
+    for (size_t index = uses_vertex_a && uses_vertex_b ? 1 : 0; index < Maxwell::MaxShaderProgram; ++index) {
         if (key.unique_hashes[index] == 0) {
             continue;
         }