mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-06 01:12:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

renderer_vulkan: Remove need for empty bindVertexBuffers2EXT.

Browse Source
This commit is contained in:
squidbus 2025-01-08 19:19:45 -08:00
parent ae92e9c5a0
commit 2caca8b68d
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/video_core/buffer_cache/buffer_cache.cpp
View File

@ -95,26 +95,13 @@ void BufferCache::BindVertexBuffers(const Vulkan::GraphicsPipeline& pipeline) {
Vulkan::VertexInputs<AmdGpu::Buffer> guest_buffers; Vulkan::VertexInputs<AmdGpu::Buffer> guest_buffers;
pipeline.GetVertexInputs(attributes, bindings, guest_buffers); pipeline.GetVertexInputs(attributes, bindings, guest_buffers);
const auto dynamic_input = instance.IsVertexInputDynamicState(); if (instance.IsVertexInputDynamicState()) {
if (dynamic_input) {
// Update current vertex inputs. // Update current vertex inputs.
const auto cmdbuf = scheduler.CommandBuffer(); const auto cmdbuf = scheduler.CommandBuffer();
cmdbuf.setVertexInputEXT(bindings, attributes); cmdbuf.setVertexInputEXT(bindings, attributes);
} }
const auto null_buffer =
instance.IsNullDescriptorSupported() ? VK_NULL_HANDLE : GetBuffer(NULL_BUFFER_ID).Handle();
if (bindings.empty()) { if (bindings.empty()) {
if (!dynamic_input) {
// Required to call bindVertexBuffers2EXT at least once in the current command buffer
// with non-null strides without a non-dynamic stride pipeline in between. Thus even
// when nothing is bound we still need to make a dummy call. Non-null strides in turn
// requires a count greater than 0.
const auto cmdbuf = scheduler.CommandBuffer();
const std::array null_buffers = {null_buffer};
constexpr std::array null_offsets = {static_cast<vk::DeviceSize>(0)};
cmdbuf.bindVertexBuffers2EXT(0, null_buffers, null_offsets, null_offsets, null_offsets);
}
// If there are no bindings, there is nothing further to do. // If there are no bindings, there is nothing further to do.
return; return;
} }
@ -167,6 +154,8 @@ void BufferCache::BindVertexBuffers(const Vulkan::GraphicsPipeline& pipeline) {
Vulkan::VertexInputs<vk::DeviceSize> host_offsets; Vulkan::VertexInputs<vk::DeviceSize> host_offsets;
Vulkan::VertexInputs<vk::DeviceSize> host_sizes; Vulkan::VertexInputs<vk::DeviceSize> host_sizes;
Vulkan::VertexInputs<vk::DeviceSize> host_strides; Vulkan::VertexInputs<vk::DeviceSize> host_strides;
const auto null_buffer =
instance.IsNullDescriptorSupported() ? VK_NULL_HANDLE : GetBuffer(NULL_BUFFER_ID).Handle();
for (const auto& buffer : guest_buffers) { for (const auto& buffer : guest_buffers) {
if (buffer.GetSize() > 0) { if (buffer.GetSize() > 0) {
const auto host_buffer_info = const auto host_buffer_info =

2
src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
View File

@ -137,7 +137,7 @@ GraphicsPipeline::GraphicsPipeline(
} }
if (instance.IsVertexInputDynamicState()) { if (instance.IsVertexInputDynamicState()) {
dynamic_states.push_back(vk::DynamicState::eVertexInputEXT); dynamic_states.push_back(vk::DynamicState::eVertexInputEXT);
} else { } else if (!vertex_bindings.empty()) {
dynamic_states.push_back(vk::DynamicState::eVertexInputBindingStrideEXT); dynamic_states.push_back(vk::DynamicState::eVertexInputBindingStrideEXT);
} }