From 262b4577ccf7e2bdb658c722c5341f12353c5a2c Mon Sep 17 00:00:00 2001 From: offtkp Date: Thu, 26 Sep 2024 13:00:32 +0300 Subject: [PATCH] Just remove static --- src/video_core/texture_cache/tile_manager.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/video_core/texture_cache/tile_manager.cpp b/src/video_core/texture_cache/tile_manager.cpp index 5b2712511..6624cee7f 100644 --- a/src/video_core/texture_cache/tile_manager.cpp +++ b/src/video_core/texture_cache/tile_manager.cpp @@ -295,11 +295,10 @@ TileManager::TileManager(const Vulkan::Instance& instance, Vulkan::Scheduler& sc .bindingCount = static_cast(bindings.size()), .pBindings = bindings.data(), }; - static auto desc_layout_pair = + auto [desc_layout_result, desc_layout] = instance.GetDevice().createDescriptorSetLayoutUnique(desc_layout_ci); - ASSERT_MSG(desc_layout_pair.result == vk::Result::eSuccess, - "Failed to create descriptor set layout: {}", - vk::to_string(desc_layout_pair.result)); + ASSERT_MSG(desc_layout_result == vk::Result::eSuccess, + "Failed to create descriptor set layout: {}", vk::to_string(desc_layout_result)); const vk::PushConstantRange push_constants = { .stageFlags = vk::ShaderStageFlagBits::eCompute, @@ -307,7 +306,7 @@ TileManager::TileManager(const Vulkan::Instance& instance, Vulkan::Scheduler& sc .size = sizeof(DetilerParams), }; - const vk::DescriptorSetLayout set_layout = *desc_layout_pair.value; + const vk::DescriptorSetLayout set_layout = *desc_layout; const vk::PipelineLayoutCreateInfo layout_info = { .setLayoutCount = 1U, .pSetLayouts = &set_layout,