From 9d6527b3aeb659f236d331eaab10772eb4489e62 Mon Sep 17 00:00:00 2001 From: Wunkolo Date: Sun, 19 Apr 2026 10:49:09 -0700 Subject: [PATCH] renderer_vulkan: Fix `Framebuffer::sample_count` move-operator `sample_count` needs to be move/copied over. Also reorder the accessor order to match the declaration of variables. --- src/video_core/renderer_vulkan/vk_texture_runtime.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/video_core/renderer_vulkan/vk_texture_runtime.h b/src/video_core/renderer_vulkan/vk_texture_runtime.h index f6314185b..18bd7cafa 100644 --- a/src/video_core/renderer_vulkan/vk_texture_runtime.h +++ b/src/video_core/renderer_vulkan/vk_texture_runtime.h @@ -308,7 +308,8 @@ public: formats(std::exchange( other.formats, {VideoCore::PixelFormat::Invalid, VideoCore::PixelFormat::Invalid})), width(std::exchange(other.width, 0)), height(std::exchange(other.height, 0)), - res_scale(std::exchange(other.res_scale, 1)) {} + res_scale(std::exchange(other.res_scale, 1)), + sample_count(std::exchange(other.sample_count, 1)) {} Framebuffer& operator=(Framebuffer&& other) noexcept { VideoCore::FramebufferParams::operator=(std::move(other)); @@ -323,6 +324,7 @@ public: width = std::exchange(other.width, 0); height = std::exchange(other.height, 0); res_scale = std::exchange(other.res_scale, 1); + sample_count = std::exchange(other.sample_count, 1); return *this; } @@ -351,14 +353,14 @@ public: return render_pass; } - u8 Samples() const noexcept { - return sample_count; - } - u32 Scale() const noexcept { return res_scale; } + u8 Samples() const noexcept { + return sample_count; + } + private: const Instance& instance; // Color, Depth, ColorMSAA, DepthMSAA