yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

vk_blit_screen: Fix AA destruction order

This commit is contained in:
ameerj 2021-10-23 00:15:19 -04:00 committed by Fernando Sahmkow
parent dcc5b4f6b0
commit 47369faaab
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/video_core/renderer_vulkan/vk_blit_screen.h
View File

@ -34,12 +34,11 @@ namespace Vulkan {
struct ScreenInfo; struct ScreenInfo;
class Device; class Device;
class FSR;
class RasterizerVulkan; class RasterizerVulkan;
class VKScheduler; class VKScheduler;
class VKSwapchain; class VKSwapchain;
class FSR;
struct VKScreenInfo { struct VKScreenInfo {
VkImageView image_view{}; VkImageView image_view{};
u32 width{}; u32 width{};
@ -123,7 +122,6 @@ private:
vk::DescriptorPool descriptor_pool; vk::DescriptorPool descriptor_pool;
vk::DescriptorSetLayout descriptor_set_layout; vk::DescriptorSetLayout descriptor_set_layout;
vk::PipelineLayout pipeline_layout; vk::PipelineLayout pipeline_layout;
vk::Pipeline aa_pipeline;
vk::Pipeline nearest_neightbor_pipeline; vk::Pipeline nearest_neightbor_pipeline;
vk::Pipeline bilinear_pipeline; vk::Pipeline bilinear_pipeline;
vk::Pipeline bicubic_pipeline; vk::Pipeline bicubic_pipeline;
@ -144,15 +142,18 @@ private:
std::vector<vk::Image> raw_images; std::vector<vk::Image> raw_images;
std::vector<vk::ImageView> raw_image_views; std::vector<vk::ImageView> raw_image_views;
std::vector<MemoryCommit> raw_buffer_commits; std::vector<MemoryCommit> raw_buffer_commits;
vk::Image aa_image;
vk::ImageView aa_image_view;
MemoryCommit aa_commit;
vk::Framebuffer aa_framebuffer;
vk::RenderPass aa_renderpass;
vk::DescriptorSets aa_descriptor_sets;
vk::DescriptorPool aa_descriptor_pool; vk::DescriptorPool aa_descriptor_pool;
vk::DescriptorSetLayout aa_descriptor_set_layout; vk::DescriptorSetLayout aa_descriptor_set_layout;
vk::PipelineLayout aa_pipeline_layout; vk::PipelineLayout aa_pipeline_layout;
vk::Pipeline aa_pipeline;
vk::RenderPass aa_renderpass;
vk::Framebuffer aa_framebuffer;
vk::DescriptorSets aa_descriptor_sets;
vk::Image aa_image;
vk::ImageView aa_image_view;
MemoryCommit aa_commit;
u32 raw_width = 0; u32 raw_width = 0;
u32 raw_height = 0; u32 raw_height = 0;