diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.h b/src/video_core/renderer_vulkan/vk_texture_cache.h index 6cc87d8c28..eae767a95b 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.h +++ b/src/video_core/renderer_vulkan/vk_texture_cache.h @@ -141,27 +141,6 @@ public: std::array buffers{}; }; -class Sampler { -public: - explicit Sampler(TextureCacheRuntime&, const Tegra::Texture::TSCEntry&); - - [[nodiscard]] VkSampler Handle() const noexcept { - return *sampler; - } - - [[nodiscard]] VkSampler HandleWithDefaultAnisotropy() const noexcept { - return *sampler_default_anisotropy; - } - - [[nodiscard]] bool HasAddedAnisotropy() const noexcept { - return static_cast(sampler_default_anisotropy); - } - -private: - vk::Sampler sampler; - vk::Sampler sampler_default_anisotropy; -}; - class Framebuffer { public: explicit Framebuffer(TextureCacheRuntime& runtime, std::span color_buffers, @@ -330,10 +309,9 @@ private: VkImageAspectFlags aspect_mask = 0; bool initialized = false; - std::unique_ptr scale_framebuffer; + std::optional scale_framebuffer; + std::optional normal_framebuffer; std::unique_ptr scale_view; - - std::unique_ptr normal_framebuffer; std::unique_ptr normal_view; };