2 files changed, 17 insertions, 3 deletions

diff --git a/src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp b/src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp
index 6a5243c9f..fb2031fc8 100644
--- a/src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp
+++ b/src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp
@@ -560,32 +560,45 @@ void VisitUsages(Info& info, IR::Inst& inst) {
     case IR::Opcode::GetCbufU32:
     case IR::Opcode::GetCbufF32:
     case IR::Opcode::GetCbufU32x2: {
-        if (const IR::Value index{inst.Arg(0)}; index.IsImmediate()) {
-            AddConstantBufferDescriptor(info, index.U32(), 1);
-        } else {
+        const IR::Value index{inst.Arg(0)};
+        const IR::Value offset{inst.Arg(1)};
+        if (!index.IsImmediate()) {
             throw NotImplementedException("Constant buffer with non-immediate index");
         }
+        AddConstantBufferDescriptor(info, index.U32(), 1);
+        u32 element_size{};
         switch (inst.GetOpcode()) {
         case IR::Opcode::GetCbufU8:
         case IR::Opcode::GetCbufS8:
             info.used_constant_buffer_types |= IR::Type::U8;
+            element_size = 1;
             break;
         case IR::Opcode::GetCbufU16:
         case IR::Opcode::GetCbufS16:
             info.used_constant_buffer_types |= IR::Type::U16;
+            element_size = 2;
             break;
         case IR::Opcode::GetCbufU32:
             info.used_constant_buffer_types |= IR::Type::U32;
+            element_size = 4;
             break;
         case IR::Opcode::GetCbufF32:
             info.used_constant_buffer_types |= IR::Type::F32;
+            element_size = 4;
             break;
         case IR::Opcode::GetCbufU32x2:
             info.used_constant_buffer_types |= IR::Type::U32x2;
+            element_size = 8;
             break;
         default:
             break;
         }
+        u32& size{info.constant_buffer_used_sizes[index.U32()]};
+        if (offset.IsImmediate()) {
+            size = std::max(size, offset.U32() + element_size);
+        } else {
+            size = 0x10'000;
+        }
         break;
     }
     case IR::Opcode::BindlessImageSampleImplicitLod:
diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index d5b2ca7bc..32f8a50ea 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -197,6 +197,7 @@ struct Info {
     IR::Type used_storage_buffer_types{};
 
     u32 constant_buffer_mask{};
+    std::array<u32, MAX_CBUFS> constant_buffer_used_sizes{};
     u32 nvn_buffer_base{};
     std::bitset<16> nvn_buffer_used{};