rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-21 22:54:16 +01:00
Code Issues Projects Releases Wiki Activity

[dxvk] Rename compilePipeline -> createPipeline

Browse Source 
More in line with Vulkan naming.
This commit is contained in:
Philip Rebohle 2019-07-30 09:41:22 +02:00
parent 6ab074c95b
commit 20b0cbdfb6
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dxvk/dxvk_compute.cpp
View File

@ -52,7 +52,7 @@ namespace dxvk {
// If no pipeline instance exists with the given state // If no pipeline instance exists with the given state
// vector, create a new one and add it to the list. // 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 // Add new pipeline to the set
m_pipelines.push_back({ state, newPipelineHandle }); m_pipelines.push_back({ state, newPipelineHandle });
@ -80,7 +80,7 @@ namespace dxvk {
} }
VkPipeline DxvkComputePipeline::compilePipeline( VkPipeline DxvkComputePipeline::createPipeline(
const DxvkComputePipelineStateInfo& state) const { const DxvkComputePipelineStateInfo& state) const {
std::vector<VkDescriptorSetLayoutBinding> bindings; std::vector<VkDescriptorSetLayoutBinding> bindings;

2
src/dxvk/dxvk_compute.h
View File

@ -95,7 +95,7 @@ namespace dxvk {
const DxvkComputePipelineStateInfo& state, const DxvkComputePipelineStateInfo& state,
VkPipeline& pipeline) const; VkPipeline& pipeline) const;
VkPipeline compilePipeline( VkPipeline createPipeline(
const DxvkComputePipelineStateInfo& state) const; const DxvkComputePipelineStateInfo& state) const;
void destroyPipeline( void destroyPipeline(

4
src/dxvk/dxvk_graphics.cpp
View File

@ -115,7 +115,7 @@ namespace dxvk {
// If no pipeline instance exists with the given state // If no pipeline instance exists with the given state
// vector, create a new one and add it to the list. // 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 // Add new pipeline to the set
m_pipelines.emplace_back(state, renderPassHandle, newPipelineHandle); m_pipelines.emplace_back(state, renderPassHandle, newPipelineHandle);
@ -141,7 +141,7 @@ namespace dxvk {
} }
VkPipeline DxvkGraphicsPipeline::compilePipeline( VkPipeline DxvkGraphicsPipeline::createPipeline(
const DxvkGraphicsPipelineStateInfo& state, const DxvkGraphicsPipelineStateInfo& state,
const DxvkRenderPass& renderPass) const { const DxvkRenderPass& renderPass) const {
if (Logger::logLevel() <= LogLevel::Debug) { if (Logger::logLevel() <= LogLevel::Debug) {

9
src/dxvk/dxvk_graphics.h
View File

@ -152,6 +152,7 @@ namespace dxvk {
: m_stateVector (), : m_stateVector (),
m_renderPass (VK_NULL_HANDLE), m_renderPass (VK_NULL_HANDLE),
m_pipeline (VK_NULL_HANDLE) { } m_pipeline (VK_NULL_HANDLE) { }
DxvkGraphicsPipelineInstance( DxvkGraphicsPipelineInstance(
const DxvkGraphicsPipelineStateInfo& state, const DxvkGraphicsPipelineStateInfo& state,
VkRenderPass rp, VkRenderPass rp,
@ -254,12 +255,6 @@ namespace dxvk {
private: private:
struct PipelineStruct {
DxvkGraphicsPipelineStateInfo stateVector;
VkRenderPass renderPass;
VkPipeline pipeline;
};
Rc<vk::DeviceFn> m_vkd; Rc<vk::DeviceFn> m_vkd;
DxvkPipelineManager* m_pipeMgr; DxvkPipelineManager* m_pipeMgr;
@ -282,7 +277,7 @@ namespace dxvk {
const DxvkGraphicsPipelineStateInfo& state, const DxvkGraphicsPipelineStateInfo& state,
VkRenderPass renderPass) const; VkRenderPass renderPass) const;
VkPipeline compilePipeline( VkPipeline createPipeline(
const DxvkGraphicsPipelineStateInfo& state, const DxvkGraphicsPipelineStateInfo& state,
const DxvkRenderPass& renderPass) const; const DxvkRenderPass& renderPass) const;