From fbf2b8fd4f61058310b4d41244c9880e663b19e5 Mon Sep 17 00:00:00 2001 From: lizzie Date: Wed, 14 Jan 2026 20:12:15 +0000 Subject: [PATCH] fixup2 --- src/video_core/renderer_opengl/gl_texture_cache.cpp | 2 +- src/video_core/renderer_vulkan/vk_texture_cache.cpp | 2 +- src/video_core/renderer_vulkan/vk_texture_cache.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp index 4e771e21ac..14ab5dd967 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.cpp +++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp @@ -1219,7 +1219,7 @@ GLuint ImageView::StorageView(Shader::TextureType texture_type, Shader::ImageFor const bool is_signed = image_format == Shader::ImageFormat::R8_SINT || image_format == Shader::ImageFormat::R16_SINT; if (!storage_views) - storage_views = std::make_optional(); + storage_views.emplace(); auto& type_views{is_signed ? storage_views->signeds : storage_views->unsigneds}; GLuint& view{type_views[size_t(texture_type)]}; if (view == 0) diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index c930c809d1..a950ffed7a 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp @@ -2266,7 +2266,7 @@ VkImageView ImageView::StorageView(Shader::TextureType texture_type, const bool is_signed = image_format == Shader::ImageFormat::R8_SINT || image_format == Shader::ImageFormat::R16_SINT; if (!storage_views) - storage_views = std::make_optional(); + storage_views.emplace(); auto& views{is_signed ? storage_views->signeds : storage_views->unsigneds}; auto& view{views[size_t(texture_type)]}; if (!view) diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.h b/src/video_core/renderer_vulkan/vk_texture_cache.h index eae767a95b..4bb9687ab0 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.h +++ b/src/video_core/renderer_vulkan/vk_texture_cache.h @@ -379,7 +379,7 @@ private: const SlotVector* slot_images = nullptr; std::array image_views; - std::unique_ptr storage_views; + std::optional storage_views; vk::ImageView depth_view; vk::ImageView stencil_view; vk::ImageView color_view;