From a1a7bb9092b9aae69979cb69a32cc8c16e6f2178 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Tue, 23 Jan 2018 17:40:36 +0100
Subject: [PATCH] [dxvk] DxvkBindingLayout -> DxvkPipelineLayout

---
 src/dxvk/dxvk_compute.cpp    | 2 +-
 src/dxvk/dxvk_compute.h      | 4 ++--
 src/dxvk/dxvk_context.cpp    | 4 ++--
 src/dxvk/dxvk_context.h      | 4 ++--
 src/dxvk/dxvk_graphics.cpp   | 2 +-
 src/dxvk/dxvk_graphics.h     | 4 ++--
 src/dxvk/dxvk_pipelayout.cpp | 8 ++++----
 src/dxvk/dxvk_pipelayout.h   | 6 +++---
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/dxvk/dxvk_compute.cpp b/src/dxvk/dxvk_compute.cpp
index a86c1dd6..44194ab2 100644
--- a/src/dxvk/dxvk_compute.cpp
+++ b/src/dxvk/dxvk_compute.cpp
@@ -12,7 +12,7 @@ namespace dxvk {
     DxvkDescriptorSlotMapping slotMapping;
     cs->defineResourceSlots(slotMapping);
     
-    m_layout = new DxvkBindingLayout(m_vkd,
+    m_layout = new DxvkPipelineLayout(m_vkd,
       slotMapping.bindingCount(),
       slotMapping.bindingInfos());
     
diff --git a/src/dxvk/dxvk_compute.h b/src/dxvk/dxvk_compute.h
index 0a7cccfd..e1c605fd 100644
--- a/src/dxvk/dxvk_compute.h
+++ b/src/dxvk/dxvk_compute.h
@@ -35,7 +35,7 @@ namespace dxvk {
      * slots used by the pipeline.
      * \returns Pipeline layout
      */
-    Rc<DxvkBindingLayout> layout() const {
+    Rc<DxvkPipelineLayout> layout() const {
       return m_layout;
     }
     
@@ -53,7 +53,7 @@ namespace dxvk {
     const Rc<vk::DeviceFn>  m_vkd;
     
     Rc<DxvkPipelineCache> m_cache;
-    Rc<DxvkBindingLayout> m_layout;
+    Rc<DxvkPipelineLayout> m_layout;
     Rc<DxvkShaderModule>  m_cs;
     
     VkPipeline m_pipeline = VK_NULL_HANDLE;
diff --git a/src/dxvk/dxvk_context.cpp b/src/dxvk/dxvk_context.cpp
index f9e7f5a8..0f769974 100644
--- a/src/dxvk/dxvk_context.cpp
+++ b/src/dxvk/dxvk_context.cpp
@@ -1236,7 +1236,7 @@ namespace dxvk {
   
   void DxvkContext::updateShaderResources(
           VkPipelineBindPoint     bindPoint,
-    const Rc<DxvkBindingLayout>&  layout) {
+    const Rc<DxvkPipelineLayout>&  layout) {
     DxvkBindingState& bs =
       bindPoint == VK_PIPELINE_BIND_POINT_GRAPHICS
         ? m_state.gp.state.bsBindingState
@@ -1323,7 +1323,7 @@ namespace dxvk {
   void DxvkContext::updateShaderDescriptors(
           VkPipelineBindPoint     bindPoint,
     const DxvkBindingState&       bindingState,
-    const Rc<DxvkBindingLayout>&  layout) {
+    const Rc<DxvkPipelineLayout>&  layout) {
     std::array<VkWriteDescriptorSet, MaxNumResourceSlots> writes;
     
     const VkDescriptorSet dset =
diff --git a/src/dxvk/dxvk_context.h b/src/dxvk/dxvk_context.h
index a63e3c3c..7cfc63fc 100644
--- a/src/dxvk/dxvk_context.h
+++ b/src/dxvk/dxvk_context.h
@@ -541,12 +541,12 @@ namespace dxvk {
     
     void updateShaderResources(
             VkPipelineBindPoint     bindPoint,
-      const Rc<DxvkBindingLayout>&  layout);
+      const Rc<DxvkPipelineLayout>&  layout);
     
     void updateShaderDescriptors(
             VkPipelineBindPoint     bindPoint,
       const DxvkBindingState&       bindingState,
-      const Rc<DxvkBindingLayout>&  layout);
+      const Rc<DxvkPipelineLayout>&  layout);
     
     void updateDynamicState();
     void updateViewports();
diff --git a/src/dxvk/dxvk_graphics.cpp b/src/dxvk/dxvk_graphics.cpp
index 22c4bb60..7e8d9337 100644
--- a/src/dxvk/dxvk_graphics.cpp
+++ b/src/dxvk/dxvk_graphics.cpp
@@ -50,7 +50,7 @@ namespace dxvk {
     if (gs  != nullptr) gs ->defineResourceSlots(slotMapping);
     if (fs  != nullptr) fs ->defineResourceSlots(slotMapping);
     
-    m_layout = new DxvkBindingLayout(m_vkd,
+    m_layout = new DxvkPipelineLayout(m_vkd,
       slotMapping.bindingCount(),
       slotMapping.bindingInfos());
     
diff --git a/src/dxvk/dxvk_graphics.h b/src/dxvk/dxvk_graphics.h
index 58b246c7..0957706d 100644
--- a/src/dxvk/dxvk_graphics.h
+++ b/src/dxvk/dxvk_graphics.h
@@ -107,7 +107,7 @@ namespace dxvk {
      * slots used by the pipeline.
      * \returns Pipeline layout
      */
-    Rc<DxvkBindingLayout> layout() const {
+    Rc<DxvkPipelineLayout> layout() const {
       return m_layout;
     }
     
@@ -133,7 +133,7 @@ namespace dxvk {
     const Rc<vk::DeviceFn>  m_vkd;
     
     Rc<DxvkPipelineCache> m_cache;
-    Rc<DxvkBindingLayout> m_layout;
+    Rc<DxvkPipelineLayout> m_layout;
     
     Rc<DxvkShaderModule>  m_vs;
     Rc<DxvkShaderModule>  m_tcs;
diff --git a/src/dxvk/dxvk_pipelayout.cpp b/src/dxvk/dxvk_pipelayout.cpp
index d766a12b..80412fed 100644
--- a/src/dxvk/dxvk_pipelayout.cpp
+++ b/src/dxvk/dxvk_pipelayout.cpp
@@ -41,7 +41,7 @@ namespace dxvk {
   }
   
   
-  DxvkBindingLayout::DxvkBindingLayout(
+  DxvkPipelineLayout::DxvkPipelineLayout(
     const Rc<vk::DeviceFn>&   vkd,
           uint32_t            bindingCount,
     const DxvkDescriptorSlot* bindingInfos)
@@ -73,7 +73,7 @@ namespace dxvk {
     
     if (m_vkd->vkCreateDescriptorSetLayout(m_vkd->device(),
           &dsetInfo, nullptr, &m_descriptorSetLayout) != VK_SUCCESS)
-      throw DxvkError("DxvkBindingLayout: Failed to create descriptor set layout");
+      throw DxvkError("DxvkPipelineLayout: Failed to create descriptor set layout");
     
     VkPipelineLayoutCreateInfo pipeInfo;
     pipeInfo.sType                  = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
@@ -88,12 +88,12 @@ namespace dxvk {
           &pipeInfo, nullptr, &m_pipelineLayout) != VK_SUCCESS) {
       m_vkd->vkDestroyDescriptorSetLayout(
         m_vkd->device(), m_descriptorSetLayout, nullptr);
-      throw DxvkError("DxvkBindingLayout: Failed to create pipeline layout");
+      throw DxvkError("DxvkPipelineLayout: Failed to create pipeline layout");
     }
   }
   
   
-  DxvkBindingLayout::~DxvkBindingLayout() {
+  DxvkPipelineLayout::~DxvkPipelineLayout() {
     if (m_pipelineLayout != VK_NULL_HANDLE) {
       m_vkd->vkDestroyPipelineLayout(
         m_vkd->device(), m_pipelineLayout, nullptr);
diff --git a/src/dxvk/dxvk_pipelayout.h b/src/dxvk/dxvk_pipelayout.h
index 6bc5ebc7..bee0df02 100644
--- a/src/dxvk/dxvk_pipelayout.h
+++ b/src/dxvk/dxvk_pipelayout.h
@@ -104,16 +104,16 @@ namespace dxvk {
    * Describes shader resource bindings
    * for a graphics or compute pipeline.
    */
-  class DxvkBindingLayout : public RcObject {
+  class DxvkPipelineLayout : public RcObject {
     
   public:
     
-    DxvkBindingLayout(
+    DxvkPipelineLayout(
       const Rc<vk::DeviceFn>&   vkd,
             uint32_t            bindingCount,
       const DxvkDescriptorSlot* bindingInfos);
     
-    ~DxvkBindingLayout();
+    ~DxvkPipelineLayout();
     
     /**
      * \brief Number of resource bindings