Shader_IR: Address Feedback

1 files changed, 24 insertions, 16 deletions

diff --git a/src/video_core/shader/decode.cpp b/src/video_core/shader/decode.cpp
index aed35a9b8..c702c7629 100644
--- a/src/video_core/shader/decode.cpp
+++ b/src/video_core/shader/decode.cpp
@@ -315,25 +315,33 @@ u32 ShaderIR::DecodeInstr(NodeBlock& bb, u32 pc) {
     return pc + 1;
 }
 
+void DeduceTextureHandlerSize(VideoCore::GuestDriverProfile* gpu_driver,
+                              std::list<Sampler>& used_samplers) {
+    if (gpu_driver == nullptr) {
+        LOG_CRITICAL(HW_GPU, "GPU Driver profile has not been created yet");
+        return;
+    }
+    if (gpu_driver->TextureHandlerSizeKnown() || used_samplers.size() <= 1) {
+        return;
+    }
+    u32 count{};
+    std::vector<u32> bound_offsets;
+    for (const auto& sampler : used_samplers) {
+        if (sampler.IsBindless()) {
+            continue;
+        }
+        count++;
+        bound_offsets.emplace_back(sampler.GetOffset());
+    }
+    if (count > 1) {
+        gpu_driver->DeduceTextureHandlerSize(std::move(bound_offsets));
+    }
+}
+
 void ShaderIR::PostDecode() {
     // Deduce texture handler size if needed
     auto* gpu_driver = locker.AccessGuestDriverProfile();
-    if (gpu_driver) {
-        if (!gpu_driver->TextureHandlerSizeKnown() && used_samplers.size() > 1) {
-            u32 count{};
-            std::vector<u32> bound_offsets;
-            for (const auto& sampler : used_samplers) {
-                if (sampler.IsBindless()) {
-                    continue;
-                }
-                count++;
-                bound_offsets.emplace_back(sampler.GetOffset());
-            }
-            if (count > 1) {
-                gpu_driver->DeduceTextureHandlerSize(std::move(bound_offsets));
-            }
-        }
-    }
+    DeduceTextureHandlerSize(gpu_driver, used_samplers);
 }
 
 } // namespace VideoCommon::Shader