From 1f9db49727f77f2786a799c63ec4da8f938ed03f Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Mon, 8 Aug 2022 16:10:36 +0200 Subject: [PATCH] [dxvk] Change member order in pipeline manager Ensures that pipelines are destroyed before pipeline libraries. --- src/dxvk/dxvk_pipemanager.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/dxvk/dxvk_pipemanager.h b/src/dxvk/dxvk_pipemanager.h index 9e6ed35e4..5661dd86f 100644 --- a/src/dxvk/dxvk_pipemanager.h +++ b/src/dxvk/dxvk_pipemanager.h @@ -237,16 +237,6 @@ namespace dxvk { DxvkBindingLayoutObjects, DxvkHash, DxvkEq> m_pipelineLayouts; - std::unordered_map< - DxvkComputePipelineShaders, - DxvkComputePipeline, - DxvkHash, DxvkEq> m_computePipelines; - - std::unordered_map< - DxvkGraphicsPipelineShaders, - DxvkGraphicsPipeline, - DxvkHash, DxvkEq> m_graphicsPipelines; - std::unordered_map< DxvkGraphicsPipelineVertexInputState, DxvkGraphicsPipelineVertexInputLibrary, @@ -262,6 +252,16 @@ namespace dxvk { DxvkShaderPipelineLibrary, DxvkHash, DxvkEq> m_shaderLibraries; + std::unordered_map< + DxvkComputePipelineShaders, + DxvkComputePipeline, + DxvkHash, DxvkEq> m_computePipelines; + + std::unordered_map< + DxvkGraphicsPipelineShaders, + DxvkGraphicsPipeline, + DxvkHash, DxvkEq> m_graphicsPipelines; + DxvkBindingSetLayout* createDescriptorSetLayout( const DxvkBindingSetLayoutKey& key);