[dxvk] Use dynamic offsets for both graphics and compute pipelines

doitsujin · Jun 21, 2018 · db7a7fa · db7a7fa
1 parent 4b5ec1b
commit db7a7fa
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/src/dxvk/dxvk_compute.cpp b/src/dxvk/dxvk_compute.cpp
@@ -25,6 +25,10 @@ namespace dxvk {
     m_cache(cache) {
     DxvkDescriptorSlotMapping slotMapping;
     cs->defineResourceSlots(slotMapping);
+
+    slotMapping.makeDescriptorsDynamic(
+      device->options().maxNumDynamicUniformBuffers,
+      device->options().maxNumDynamicStorageBuffers);
 
     m_layout = new DxvkPipelineLayout(m_vkd,
       slotMapping.bindingCount(),

diff --git a/src/dxvk/dxvk_compute.h b/src/dxvk/dxvk_compute.h
@@ -50,8 +50,8 @@ namespace dxvk {
      * slots used by the pipeline.
      * \returns Pipeline layout
      */
-    Rc<DxvkPipelineLayout> layout() const {
-      return m_layout;
+    DxvkPipelineLayout* layout() const {
+      return m_layout.ptr();
     }
 
     /**

diff --git a/src/dxvk/dxvk_graphics.cpp b/src/dxvk/dxvk_graphics.cpp
@@ -73,6 +73,10 @@ namespace dxvk {
     if (gs  != nullptr) gs ->defineResourceSlots(slotMapping);
     if (fs  != nullptr) fs ->defineResourceSlots(slotMapping);
 
+    slotMapping.makeDescriptorsDynamic(
+      device->options().maxNumDynamicUniformBuffers,
+      device->options().maxNumDynamicStorageBuffers);
+
     m_layout = new DxvkPipelineLayout(m_vkd,
       slotMapping.bindingCount(),
       slotMapping.bindingInfos(),

diff --git a/src/dxvk/dxvk_graphics.h b/src/dxvk/dxvk_graphics.h
@@ -188,8 +188,8 @@ namespace dxvk {
      * slots used by the pipeline.
      * \returns Pipeline layout
      */
-    Rc<DxvkPipelineLayout> layout() const {
-      return m_layout;
+    DxvkPipelineLayout* layout() const {
+      return m_layout.ptr();
     }
 
     /**