franklinblanco/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12390 from liamwhite/binding-insanity

Browse Source 
renderer_vulkan: work around turnip binding bug in a610
This commit is contained in:
Fernando S 2023-12-20 18:44:47 +01:00 committed by GitHub
commit 234867b84d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/video_core/renderer_vulkan/vk_buffer_cache.cpp
View File

@ -563,22 +563,27 @@ void BufferCacheRuntime::BindVertexBuffers(VideoCommon::HostBindings<Buffer>& bi
} }
buffer_handles.push_back(handle); buffer_handles.push_back(handle);
} }
const u32 device_max = device.GetMaxVertexInputBindings();
const u32 min_binding = std::min(bindings.min_index, device_max);
const u32 max_binding = std::min(bindings.max_index, device_max);
const u32 binding_count = max_binding - min_binding;
if (binding_count == 0) {
return;
}
if (device.IsExtExtendedDynamicStateSupported()) { if (device.IsExtExtendedDynamicStateSupported()) {
scheduler.Record([this, bindings_ = std::move(bindings), scheduler.Record([bindings_ = std::move(bindings),
buffer_handles_ = std::move(buffer_handles)](vk::CommandBuffer cmdbuf) { buffer_handles_ = std::move(buffer_handles),
cmdbuf.BindVertexBuffers2EXT(bindings_.min_index, binding_count](vk::CommandBuffer cmdbuf) {
std::min(bindings_.max_index - bindings_.min_index, cmdbuf.BindVertexBuffers2EXT(bindings_.min_index, binding_count, buffer_handles_.data(),
device.GetMaxVertexInputBindings()), bindings_.offsets.data(), bindings_.sizes.data(),
buffer_handles_.data(), bindings_.offsets.data(), bindings_.strides.data());
bindings_.sizes.data(), bindings_.strides.data());
}); });
} else { } else {
scheduler.Record([this, bindings_ = std::move(bindings), scheduler.Record([bindings_ = std::move(bindings),
buffer_handles_ = std::move(buffer_handles)](vk::CommandBuffer cmdbuf) { buffer_handles_ = std::move(buffer_handles),
cmdbuf.BindVertexBuffers(bindings_.min_index, binding_count](vk::CommandBuffer cmdbuf) {
std::min(bindings_.max_index - bindings_.min_index, cmdbuf.BindVertexBuffers(bindings_.min_index, binding_count, buffer_handles_.data(),
device.GetMaxVertexInputBindings()), bindings_.offsets.data());
buffer_handles_.data(), bindings_.offsets.data());
}); });
} }
} }

5
src/video_core/vulkan_common/vulkan_device.cpp
View File

@ -695,6 +695,11 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
std::min(properties.properties.limits.maxVertexInputBindings, 16U); std::min(properties.properties.limits.maxVertexInputBindings, 16U);
} }
if (is_turnip) {
LOG_WARNING(Render_Vulkan, "Turnip requires higher-than-reported binding limits");
properties.properties.limits.maxVertexInputBindings = 32;
}
if (!extensions.extended_dynamic_state && extensions.extended_dynamic_state2) { if (!extensions.extended_dynamic_state && extensions.extended_dynamic_state2) {
LOG_INFO(Render_Vulkan, LOG_INFO(Render_Vulkan,
"Removing extendedDynamicState2 due to missing extendedDynamicState"); "Removing extendedDynamicState2 due to missing extendedDynamicState");