From 20b0cbdfb6d18ab090f53d9505e0c2371126a102 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Tue, 30 Jul 2019 09:41:22 +0200
Subject: [PATCH] [dxvk] Rename compilePipeline -> createPipeline

More in line with Vulkan naming.
---
 src/dxvk/dxvk_compute.cpp  | 4 ++--
 src/dxvk/dxvk_compute.h    | 2 +-
 src/dxvk/dxvk_graphics.cpp | 4 ++--
 src/dxvk/dxvk_graphics.h   | 9 ++-------
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/dxvk/dxvk_compute.cpp b/src/dxvk/dxvk_compute.cpp
index 355b01b12..f233ae190 100644
--- a/src/dxvk/dxvk_compute.cpp
+++ b/src/dxvk/dxvk_compute.cpp
@@ -52,7 +52,7 @@ namespace dxvk {
     
       // If no pipeline instance exists with the given state
       // vector, create a new one and add it to the list.
-      newPipelineHandle = this->compilePipeline(state);
+      newPipelineHandle = this->createPipeline(state);
       
       // Add new pipeline to the set
       m_pipelines.push_back({ state, newPipelineHandle });
@@ -80,7 +80,7 @@ namespace dxvk {
   }
   
   
-  VkPipeline DxvkComputePipeline::compilePipeline(
+  VkPipeline DxvkComputePipeline::createPipeline(
     const DxvkComputePipelineStateInfo& state) const {
     std::vector<VkDescriptorSetLayoutBinding> bindings;
 
diff --git a/src/dxvk/dxvk_compute.h b/src/dxvk/dxvk_compute.h
index ea6c6baa7..df87b46d0 100644
--- a/src/dxvk/dxvk_compute.h
+++ b/src/dxvk/dxvk_compute.h
@@ -95,7 +95,7 @@ namespace dxvk {
       const DxvkComputePipelineStateInfo& state,
             VkPipeline&                   pipeline) const;
     
-    VkPipeline compilePipeline(
+    VkPipeline createPipeline(
       const DxvkComputePipelineStateInfo& state) const;
     
     void destroyPipeline(
diff --git a/src/dxvk/dxvk_graphics.cpp b/src/dxvk/dxvk_graphics.cpp
index a80515847..4dbfbf610 100644
--- a/src/dxvk/dxvk_graphics.cpp
+++ b/src/dxvk/dxvk_graphics.cpp
@@ -115,7 +115,7 @@ namespace dxvk {
       
       // If no pipeline instance exists with the given state
       // vector, create a new one and add it to the list.
-      newPipelineHandle = this->compilePipeline(state, renderPass);
+      newPipelineHandle = this->createPipeline(state, renderPass);
 
       // Add new pipeline to the set
       m_pipelines.emplace_back(state, renderPassHandle, newPipelineHandle);
@@ -141,7 +141,7 @@ namespace dxvk {
   }
   
   
-  VkPipeline DxvkGraphicsPipeline::compilePipeline(
+  VkPipeline DxvkGraphicsPipeline::createPipeline(
     const DxvkGraphicsPipelineStateInfo& state,
     const DxvkRenderPass&                renderPass) const {
     if (Logger::logLevel() <= LogLevel::Debug) {
diff --git a/src/dxvk/dxvk_graphics.h b/src/dxvk/dxvk_graphics.h
index 1bd6c8001..c696b1ce1 100644
--- a/src/dxvk/dxvk_graphics.h
+++ b/src/dxvk/dxvk_graphics.h
@@ -152,6 +152,7 @@ namespace dxvk {
     : m_stateVector (),
       m_renderPass  (VK_NULL_HANDLE),
       m_pipeline    (VK_NULL_HANDLE) { }
+
     DxvkGraphicsPipelineInstance(
       const DxvkGraphicsPipelineStateInfo&  state,
             VkRenderPass                    rp,
@@ -254,12 +255,6 @@ namespace dxvk {
     
   private:
     
-    struct PipelineStruct {
-      DxvkGraphicsPipelineStateInfo stateVector;
-      VkRenderPass                  renderPass;
-      VkPipeline                    pipeline;
-    };
-    
     Rc<vk::DeviceFn>            m_vkd;
     DxvkPipelineManager*        m_pipeMgr;
 
@@ -282,7 +277,7 @@ namespace dxvk {
       const DxvkGraphicsPipelineStateInfo& state,
             VkRenderPass                   renderPass) const;
     
-    VkPipeline compilePipeline(
+    VkPipeline createPipeline(
       const DxvkGraphicsPipelineStateInfo& state,
       const DxvkRenderPass&                renderPass) const;