From 54eaa444a2e43286e1954352b879d6ad02377e3f Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Thu, 30 Jun 2022 18:31:23 +0200
Subject: [PATCH] [dxvk] Use null descriptors for unbound resources

---
 src/dxvk/dxvk_context.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/dxvk/dxvk_context.cpp b/src/dxvk/dxvk_context.cpp
index c6aae0bf2..540c0f5c2 100644
--- a/src/dxvk/dxvk_context.cpp
+++ b/src/dxvk/dxvk_context.cpp
@@ -4165,7 +4165,7 @@ namespace dxvk {
                 m_cmd->trackResource<DxvkAccess::Read>(res.imageView->image());
               }
             } else {
-              m_descriptors[k].image = m_common->dummyResources().imageViewDescriptor(binding.viewType, true);
+              m_descriptors[k].image = VkDescriptorImageInfo();
               newBindMask.clr(bindingIndex + j);
             }
           } break;
@@ -4183,7 +4183,7 @@ namespace dxvk {
                 m_cmd->trackResource<DxvkAccess::Write>(res.imageView->image());
               }
             } else {
-              m_descriptors[k].image = m_common->dummyResources().imageViewDescriptor(binding.viewType, false);
+              m_descriptors[k].image = VkDescriptorImageInfo();
               newBindMask.clr(bindingIndex + j);
             }
           } break;
@@ -4203,7 +4203,7 @@ namespace dxvk {
                 m_cmd->trackResource<DxvkAccess::Read>(res.imageView->image());
               }
             } else {
-              m_descriptors[k].image = m_common->dummyResources().imageSamplerDescriptor(binding.viewType);
+              m_descriptors[k].image = m_common->dummyResources().samplerDescriptor();
               newBindMask.clr(bindingIndex + j);
             }
           } break;
@@ -4220,7 +4220,7 @@ namespace dxvk {
                 m_cmd->trackResource<DxvkAccess::Read>(res.bufferView->buffer());
               }
             } else {
-              m_descriptors[k].texelBuffer = m_common->dummyResources().bufferViewDescriptor();
+              m_descriptors[k].texelBuffer = VK_NULL_HANDLE;
               newBindMask.clr(bindingIndex + j);
             }
           } break;
@@ -4237,7 +4237,7 @@ namespace dxvk {
                 m_cmd->trackResource<DxvkAccess::Write>(res.bufferView->buffer());
               }
             } else {
-              m_descriptors[k].texelBuffer = m_common->dummyResources().bufferViewDescriptor();
+              m_descriptors[k].texelBuffer = VK_NULL_HANDLE;
               newBindMask.clr(bindingIndex + j);
             }
           } break;
@@ -4251,7 +4251,7 @@ namespace dxvk {
               if (m_rcTracked.set(binding.resourceBinding))
                 m_cmd->trackResource<DxvkAccess::Read>(res.bufferSlice.buffer());
             } else {
-              m_descriptors[k].buffer = m_common->dummyResources().bufferDescriptor();
+              m_descriptors[k].buffer = VkDescriptorBufferInfo();
             }
           } break;
 
@@ -4264,7 +4264,7 @@ namespace dxvk {
               if (m_rcTracked.set(binding.resourceBinding))
                 m_cmd->trackResource<DxvkAccess::Write>(res.bufferSlice.buffer());
             } else {
-              m_descriptors[k].buffer = m_common->dummyResources().bufferDescriptor();
+              m_descriptors[k].buffer = VkDescriptorBufferInfo();
               newBindMask.clr(bindingIndex + j);
             }
           } break;