Don't bother binding char info for graph compute

doitsujin · Feb 7, 2025 · 13bc8f5 · 13bc8f5
1 parent 5cb9805
commit 13bc8f5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/src/dxvk/hud/dxvk_hud_item.cpp b/src/dxvk/hud/dxvk_hud_item.cpp
@@ -331,17 +331,15 @@ namespace dxvk::hud {
 
     VkBufferView textBufferView = m_textView->handle();
 
-    std::array<VkWriteDescriptorSet, 5> descriptorWrites = {{
+    std::array<VkWriteDescriptorSet, 4> descriptorWrites = {{
       { VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, nullptr,
         set, 0, 0, 1, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, nullptr, &frameTimeBuffer },
       { VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, nullptr,
-        set, 1, 0, 1, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, nullptr, &charInfoBuffer },
+        set, 1, 0, 1, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, nullptr, &drawParamBuffer },
       { VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, nullptr,
-        set, 2, 0, 1, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, nullptr, &drawParamBuffer },
+        set, 2, 0, 1, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, nullptr, &drawInfoBuffer },
       { VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, nullptr,
-        set, 3, 0, 1, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, nullptr, &drawInfoBuffer },
-      { VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, nullptr,
-        set, 4, 0, 1, VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, nullptr, nullptr, &textBufferView },
+        set, 3, 0, 1, VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, nullptr, nullptr, &textBufferView },
     }};
 
     ctx.cmd->updateDescriptorSets(
@@ -503,8 +501,7 @@ namespace dxvk::hud {
       { 0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,       1, VK_SHADER_STAGE_COMPUTE_BIT },
       { 1, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,       1, VK_SHADER_STAGE_COMPUTE_BIT },
       { 2, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,       1, VK_SHADER_STAGE_COMPUTE_BIT },
-      { 3, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,       1, VK_SHADER_STAGE_COMPUTE_BIT },
-      { 4, VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, 1, VK_SHADER_STAGE_COMPUTE_BIT },
+      { 3, VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, 1, VK_SHADER_STAGE_COMPUTE_BIT },
     }};
 
     VkDescriptorSetLayoutCreateInfo setLayoutInfo = { VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO };

diff --git a/src/dxvk/hud/shaders/hud_frame_time_eval.comp b/src/dxvk/hud/shaders/hud_frame_time_eval.comp
@@ -31,17 +31,17 @@ workgroupcoherent buffer timestamp_buffer_t {
   float frame_time_max_ms;
 };
 
-layout(binding = 2, std430)
+layout(binding = 1, std430)
 writeonly buffer draw_param_buffer_t {
   draw_param_t draw_params[];
 };
 
-layout(binding = 3, std430)
+layout(binding = 2, std430)
 writeonly buffer draw_info_buffer_t {
   draw_info_t draw_infos[];
 };
 
-layout(binding = 4)
+layout(binding = 3)
 uniform writeonly uimageBuffer text_buffer;
 
 layout(push_constant)