diff options
| author | 2021-11-17 00:59:46 +0100 | |
|---|---|---|
| committer | 2021-11-17 00:59:46 +0100 | |
| commit | 978f598ff64d3bd0299d06c47e6cbd63a496122c (patch) | |
| tree | 068f59369198281c5388b1164ed6cb5522ba5a8e /src/video_core/renderer_vulkan | |
| parent | TextureCache: Add automatic anisotropic filtering and refactor code. (diff) | |
| download | yuzu-978f598ff64d3bd0299d06c47e6cbd63a496122c.tar.gz yuzu-978f598ff64d3bd0299d06c47e6cbd63a496122c.tar.xz yuzu-978f598ff64d3bd0299d06c47e6cbd63a496122c.zip | |
TextureCache: Fix OGL cleaning
Diffstat (limited to 'src/video_core/renderer_vulkan')
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_texture_cache.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_texture_cache.h | 16 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index daf26f380..407fd2a15 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp | |||
| @@ -1366,6 +1366,8 @@ ImageView::ImageView(TextureCacheRuntime&, const VideoCommon::ImageInfo& info, | |||
| 1366 | ImageView::ImageView(TextureCacheRuntime&, const VideoCommon::NullImageViewParams& params) | 1366 | ImageView::ImageView(TextureCacheRuntime&, const VideoCommon::NullImageViewParams& params) |
| 1367 | : VideoCommon::ImageViewBase{params} {} | 1367 | : VideoCommon::ImageViewBase{params} {} |
| 1368 | 1368 | ||
| 1369 | ImageView::~ImageView() = default; | ||
| 1370 | |||
| 1369 | VkImageView ImageView::DepthView() { | 1371 | VkImageView ImageView::DepthView() { |
| 1370 | if (depth_view) { | 1372 | if (depth_view) { |
| 1371 | return *depth_view; | 1373 | return *depth_view; |
| @@ -1492,6 +1494,8 @@ Framebuffer::Framebuffer(TextureCacheRuntime& runtime, ImageView* color_buffer, | |||
| 1492 | CreateFramebuffer(runtime, color_buffers, depth_buffer); | 1494 | CreateFramebuffer(runtime, color_buffers, depth_buffer); |
| 1493 | } | 1495 | } |
| 1494 | 1496 | ||
| 1497 | Framebuffer::~Framebuffer() = default; | ||
| 1498 | |||
| 1495 | void Framebuffer::CreateFramebuffer(TextureCacheRuntime& runtime, | 1499 | void Framebuffer::CreateFramebuffer(TextureCacheRuntime& runtime, |
| 1496 | std::span<ImageView*, NUM_RT> color_buffers, | 1500 | std::span<ImageView*, NUM_RT> color_buffers, |
| 1497 | ImageView* depth_buffer) { | 1501 | ImageView* depth_buffer) { |
diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.h b/src/video_core/renderer_vulkan/vk_texture_cache.h index 9d149d306..ff28b4e96 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.h +++ b/src/video_core/renderer_vulkan/vk_texture_cache.h | |||
| @@ -162,6 +162,14 @@ public: | |||
| 162 | const VideoCommon::ImageViewInfo&, GPUVAddr); | 162 | const VideoCommon::ImageViewInfo&, GPUVAddr); |
| 163 | explicit ImageView(TextureCacheRuntime&, const VideoCommon::NullImageViewParams&); | 163 | explicit ImageView(TextureCacheRuntime&, const VideoCommon::NullImageViewParams&); |
| 164 | 164 | ||
| 165 | ~ImageView(); | ||
| 166 | |||
| 167 | ImageView(const ImageView&) = delete; | ||
| 168 | ImageView& operator=(const ImageView&) = delete; | ||
| 169 | |||
| 170 | ImageView(ImageView&&) = default; | ||
| 171 | ImageView& operator=(ImageView&&) = default; | ||
| 172 | |||
| 165 | [[nodiscard]] VkImageView DepthView(); | 173 | [[nodiscard]] VkImageView DepthView(); |
| 166 | 174 | ||
| 167 | [[nodiscard]] VkImageView StencilView(); | 175 | [[nodiscard]] VkImageView StencilView(); |
| @@ -235,6 +243,14 @@ public: | |||
| 235 | explicit Framebuffer(TextureCacheRuntime& runtime, ImageView* color_buffer, | 243 | explicit Framebuffer(TextureCacheRuntime& runtime, ImageView* color_buffer, |
| 236 | ImageView* depth_buffer, VkExtent2D extent); | 244 | ImageView* depth_buffer, VkExtent2D extent); |
| 237 | 245 | ||
| 246 | ~Framebuffer(); | ||
| 247 | |||
| 248 | Framebuffer(const Framebuffer&) = delete; | ||
| 249 | Framebuffer& operator=(const Framebuffer&) = delete; | ||
| 250 | |||
| 251 | Framebuffer(Framebuffer&&) = default; | ||
| 252 | Framebuffer& operator=(Framebuffer&&) = default; | ||
| 253 | |||
| 238 | void CreateFramebuffer(TextureCacheRuntime& runtime, | 254 | void CreateFramebuffer(TextureCacheRuntime& runtime, |
| 239 | std::span<ImageView*, NUM_RT> color_buffers, ImageView* depth_buffer); | 255 | std::span<ImageView*, NUM_RT> color_buffers, ImageView* depth_buffer); |
| 240 | 256 | ||