Mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-05-20 18:34:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vulkan: Fix two more validation errors. (#1250)

Browse source
This commit is contained in:
squidbus 2024-10-05 11:35:02 -07:00 • committed by GitHub
parent 1dabea7514
commit ee57c2fd69
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
View file

@ -392,8 +392,9 @@ void EmitContext::DefineBuffers() {
const bool is_storage = desc.IsStorage(sharp); const bool is_storage = desc.IsStorage(sharp);
const auto* data_types = True(desc.used_types & IR::Type::F32) ? &F32 : &U32; const auto* data_types = True(desc.used_types & IR::Type::F32) ? &F32 : &U32;
const Id data_type = (*data_types)[1]; const Id data_type = (*data_types)[1];
const Id record_array_type{is_storage ? TypeRuntimeArray(data_type) const Id record_array_type{
: TypeArray(data_type, ConstU32(sharp.NumDwords()))}; is_storage ? TypeRuntimeArray(data_type)
: TypeArray(data_type, ConstU32(std::max(sharp.NumDwords(), 1U)))};
const Id struct_type{define_struct(record_array_type, desc.is_instance_data)}; const Id struct_type{define_struct(record_array_type, desc.is_instance_data)};
const auto storage_class = const auto storage_class =

5
src/video_core/renderer_vulkan/vk_swapchain.cpp
View file

@ -197,6 +197,11 @@ void Swapchain::SetSurfaceProperties() {
void Swapchain::Destroy() { void Swapchain::Destroy() {
vk::Device device = instance.GetDevice(); vk::Device device = instance.GetDevice();
const auto wait_result = device.waitIdle();
if (wait_result != vk::Result::eSuccess) {
LOG_WARNING(Render_Vulkan, "Failed to wait for device to become idle: {}",
vk::to_string(wait_result));
}
if (swapchain) { if (swapchain) {
device.destroySwapchainKHR(swapchain); device.destroySwapchainKHR(swapchain);
} }