mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2026-04-07 17:41:28 -06:00
Vulkan destroy presenter members before device (#4222)
This commit is contained in:
parent
e24f42b03c
commit
162cb18d9d
@ -8,6 +8,7 @@
|
||||
#include "common/assert.h"
|
||||
#include "common/debug.h"
|
||||
#include "common/types.h"
|
||||
#include "imgui/renderer/imgui_core.h"
|
||||
#include "sdl_window.h"
|
||||
#include "video_core/renderer_vulkan/liverpool_to_vk.h"
|
||||
#include "video_core/renderer_vulkan/vk_instance.h"
|
||||
@ -183,6 +184,7 @@ Instance::Instance(Frontend::WindowSDL& window, s32 physical_device_index,
|
||||
}
|
||||
|
||||
Instance::~Instance() {
|
||||
ImGui::Core::Shutdown(GetDevice());
|
||||
vmaDestroyAllocator(allocator);
|
||||
}
|
||||
|
||||
|
||||
@ -144,7 +144,6 @@ Presenter::~Presenter() {
|
||||
device.destroyImageView(frame.image_view);
|
||||
device.destroyFence(frame.present_done);
|
||||
}
|
||||
ImGui::Core::Shutdown(device);
|
||||
}
|
||||
|
||||
bool Presenter::IsVideoOutSurface(const AmdGpu::ColorBuffer& color_buffer) const {
|
||||
|
||||
@ -112,13 +112,13 @@ private:
|
||||
u32 expected_frame_width{1920};
|
||||
u32 expected_frame_height{1080};
|
||||
|
||||
Frontend::WindowSDL& window;
|
||||
Instance instance;
|
||||
HostPasses::FsrPass fsr_pass;
|
||||
HostPasses::FsrPass::Settings fsr_settings{};
|
||||
HostPasses::PostProcessingPass::Settings pp_settings{};
|
||||
HostPasses::PostProcessingPass pp_pass;
|
||||
Frontend::WindowSDL& window;
|
||||
AmdGpu::Liverpool* liverpool;
|
||||
Instance instance;
|
||||
Scheduler draw_scheduler;
|
||||
Scheduler present_scheduler;
|
||||
Scheduler flip_scheduler;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user