Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-05-01 17:18:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix build 3.0

Browse source
This commit is contained in:
CamilleLaVey 2026-01-28 01:15:00 -04:00
parent 769a4c043a
commit ec9e32fdcd
5 changed files with 61 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/video_core/buffer_cache/buffer_cache.h
View file

@ -352,7 +352,8 @@ void BufferCache<P>::UpdateComputeBuffers() {
} }
template <class P> template <class P>
void BufferCache<P>::BindHostGeometryBuffers(bool is_indexed, bool use_dynamic_vertex_input) { void BufferCache<P>::BindHostGeometryBuffers(bool is_indexed, bool use_dynamic_vertex_input,
vk::CommandBuffer* cmd) {
if (is_indexed) { if (is_indexed) {
BindHostIndexBuffer(); BindHostIndexBuffer();
} else if constexpr (!HAS_FULL_INDEX_AND_PRIMITIVE_SUPPORT) { } else if constexpr (!HAS_FULL_INDEX_AND_PRIMITIVE_SUPPORT) {
@ -363,7 +364,7 @@ void BufferCache<P>::BindHostGeometryBuffers(bool is_indexed, bool use_dynamic_v
draw_state.vertex_buffer.count); draw_state.vertex_buffer.count);
} }
} }
BindHostVertexBuffers(use_dynamic_vertex_input); BindHostVertexBuffers(use_dynamic_vertex_input, cmd);
BindHostTransformFeedbackBuffers(); BindHostTransformFeedbackBuffers();
if (current_draw_indirect) { if (current_draw_indirect) {
BindHostDrawIndirectBuffers(); BindHostDrawIndirectBuffers();
@ -764,7 +765,7 @@ void BufferCache<P>::BindHostIndexBuffer() {
} }
template <class P> template <class P>
void BufferCache<P>::BindHostVertexBuffers(bool use_dynamic_vertex_input) { void BufferCache<P>::BindHostVertexBuffers(bool use_dynamic_vertex_input, vk::CommandBuffer* cmd) {
HostBindings<typename P::Buffer> host_bindings; HostBindings<typename P::Buffer> host_bindings;
bool any_valid{false}; bool any_valid{false};
auto& flags = maxwell3d->dirty.flags; auto& flags = maxwell3d->dirty.flags;
@ -800,7 +801,7 @@ void BufferCache<P>::BindHostVertexBuffers(bool use_dynamic_vertex_input) {
host_bindings.sizes.push_back(binding.size); host_bindings.sizes.push_back(binding.size);
host_bindings.strides.push_back(stride); host_bindings.strides.push_back(stride);
} }
runtime.BindVertexBuffers(host_bindings, use_dynamic_vertex_input); runtime.BindVertexBuffers(host_bindings, use_dynamic_vertex_input, cmd);
} }
} }

9
src/video_core/buffer_cache/buffer_cache_base.h
View file

@ -38,6 +38,10 @@
namespace VideoCommon { namespace VideoCommon {
namespace vk {
class CommandBuffer;
}
using BufferId = Common::SlotId; using BufferId = Common::SlotId;
using VideoCore::Surface::PixelFormat; using VideoCore::Surface::PixelFormat;
@ -232,7 +236,8 @@ public:
void UpdateComputeBuffers(); void UpdateComputeBuffers();
void BindHostGeometryBuffers(bool is_indexed, bool use_dynamic_vertex_input = false); void BindHostGeometryBuffers(bool is_indexed, bool use_dynamic_vertex_input = false,
vk::CommandBuffer* cmd = nullptr);
void BindHostStageBuffers(size_t stage); void BindHostStageBuffers(size_t stage);
@ -358,7 +363,7 @@ private:
void BindHostIndexBuffer(); void BindHostIndexBuffer();
void BindHostVertexBuffers(bool use_dynamic_vertex_input = false); void BindHostVertexBuffers(bool use_dynamic_vertex_input = false, vk::CommandBuffer* cmd = nullptr);
void BindHostDrawIndirectBuffers(); void BindHostDrawIndirectBuffers();

64
src/video_core/renderer_vulkan/vk_buffer_cache.cpp
View file

@ -552,31 +552,42 @@ void BufferCacheRuntime::BindQuadIndexBuffer(PrimitiveTopology topology, u32 fir
} }
void BufferCacheRuntime::BindVertexBuffer(u32 index, VkBuffer buffer, u32 offset, u32 size, u32 stride, void BufferCacheRuntime::BindVertexBuffer(u32 index, VkBuffer buffer, u32 offset, u32 size, u32 stride,
bool use_dynamic_vertex_input) { bool use_dynamic_vertex_input, vk::CommandBuffer* cmd) {
if (index >= device.GetMaxVertexInputBindings()) { if (index >= device.GetMaxVertexInputBindings()) {
return; return;
} }
if (use_dynamic_vertex_input && device.IsExtExtendedDynamicStateSupported()) { if (use_dynamic_vertex_input && device.IsExtExtendedDynamicStateSupported()) {
scheduler.Record([index, buffer, offset, size, stride](vk::CommandBuffer cmdbuf) { if (cmd) {
const VkDeviceSize vk_offset = buffer != VK_NULL_HANDLE ? offset : 0; const VkDeviceSize vk_offset = buffer != VK_NULL_HANDLE ? offset : 0;
const VkDeviceSize vk_size = buffer != VK_NULL_HANDLE ? size : VK_WHOLE_SIZE; const VkDeviceSize vk_size = buffer != VK_NULL_HANDLE ? size : VK_WHOLE_SIZE;
const VkDeviceSize vk_stride = stride; const VkDeviceSize vk_stride = stride;
cmdbuf.BindVertexBuffers2EXT(index, 1, &buffer, &vk_offset, &vk_size, &vk_stride); cmd->BindVertexBuffers2EXT(index, 1, &buffer, &vk_offset, &vk_size, &vk_stride);
}); } else {
scheduler.Record([index, buffer, offset, size, stride](vk::CommandBuffer cmdbuf) {
const VkDeviceSize vk_offset = buffer != VK_NULL_HANDLE ? offset : 0;
const VkDeviceSize vk_size = buffer != VK_NULL_HANDLE ? size : VK_WHOLE_SIZE;
const VkDeviceSize vk_stride = stride;
cmdbuf.BindVertexBuffers2EXT(index, 1, &buffer, &vk_offset, &vk_size, &vk_stride);
});
}
} else { } else {
if (!device.HasNullDescriptor() && buffer == VK_NULL_HANDLE) { if (!device.HasNullDescriptor() && buffer == VK_NULL_HANDLE) {
ReserveNullBuffer(); ReserveNullBuffer();
buffer = *null_buffer; buffer = *null_buffer;
offset = 0; offset = 0;
} }
scheduler.Record([index, buffer, offset](vk::CommandBuffer cmdbuf) { if (cmd) {
cmdbuf.BindVertexBuffer(index, buffer, offset); cmd->BindVertexBuffer(index, buffer, offset);
}); } else {
scheduler.Record([index, buffer, offset](vk::CommandBuffer cmdbuf) {
cmdbuf.BindVertexBuffer(index, buffer, offset);
});
}
} }
} }
void BufferCacheRuntime::BindVertexBuffers(VideoCommon::HostBindings<Buffer>& bindings, void BufferCacheRuntime::BindVertexBuffers(VideoCommon::HostBindings<Buffer>& bindings,
bool use_dynamic_vertex_input) { bool use_dynamic_vertex_input, vk::CommandBuffer* cmd) {
boost::container::small_vector<VkBuffer, 32> buffer_handles; boost::container::small_vector<VkBuffer, 32> buffer_handles;
for (u32 index = 0; index < bindings.buffers.size(); ++index) { for (u32 index = 0; index < bindings.buffers.size(); ++index) {
auto handle = bindings.buffers[index]->Handle(); auto handle = bindings.buffers[index]->Handle();
@ -598,20 +609,31 @@ void BufferCacheRuntime::BindVertexBuffers(VideoCommon::HostBindings<Buffer>& bi
return; return;
} }
if (use_dynamic_vertex_input && device.IsExtExtendedDynamicStateSupported()) { if (use_dynamic_vertex_input && device.IsExtExtendedDynamicStateSupported()) {
scheduler.Record([bindings_ = std::move(bindings), if (cmd) {
buffer_handles_ = std::move(buffer_handles), cmd->BindVertexBuffers2EXT(bindings.min_index, binding_count, buffer_handles.data(),
binding_count](vk::CommandBuffer cmdbuf) { bindings.offsets.data(), bindings.sizes.data(),
cmdbuf.BindVertexBuffers2EXT(bindings_.min_index, binding_count, buffer_handles_.data(), bindings.strides.data());
bindings_.offsets.data(), bindings_.sizes.data(), } else {
bindings_.strides.data()); scheduler.Record([
}); bindings_ = std::move(bindings), buffer_handles_ = std::move(buffer_handles),
binding_count](vk::CommandBuffer cmdbuf) {
cmdbuf.BindVertexBuffers2EXT(bindings_.min_index, binding_count,
buffer_handles_.data(), bindings_.offsets.data(),
bindings_.sizes.data(), bindings_.strides.data());
});
}
} else { } else {
scheduler.Record([bindings_ = std::move(bindings), if (cmd) {
buffer_handles_ = std::move(buffer_handles), cmd->BindVertexBuffers(bindings.min_index, binding_count, buffer_handles.data(),
binding_count](vk::CommandBuffer cmdbuf) { bindings.offsets.data());
cmdbuf.BindVertexBuffers(bindings_.min_index, binding_count, buffer_handles_.data(), } else {
bindings_.offsets.data()); scheduler.Record([
}); bindings_ = std::move(bindings), buffer_handles_ = std::move(buffer_handles),
binding_count](vk::CommandBuffer cmdbuf) {
cmdbuf.BindVertexBuffers(bindings_.min_index, binding_count,
buffer_handles_.data(), bindings_.offsets.data());
});
}
} }
} }

4
src/video_core/renderer_vulkan/vk_buffer_cache.h
View file

@ -124,10 +124,10 @@ public:
void BindQuadIndexBuffer(PrimitiveTopology topology, u32 first, u32 count); void BindQuadIndexBuffer(PrimitiveTopology topology, u32 first, u32 count);
void BindVertexBuffer(u32 index, VkBuffer buffer, u32 offset, u32 size, u32 stride, void BindVertexBuffer(u32 index, VkBuffer buffer, u32 offset, u32 size, u32 stride,
bool use_dynamic_vertex_input); bool use_dynamic_vertex_input, vk::CommandBuffer* cmd = nullptr);
void BindVertexBuffers(VideoCommon::HostBindings<Buffer>& bindings, void BindVertexBuffers(VideoCommon::HostBindings<Buffer>& bindings,
bool use_dynamic_vertex_input); bool use_dynamic_vertex_input, vk::CommandBuffer* cmd = nullptr);
void BindTransformFeedbackBuffer(u32 index, VkBuffer buffer, u32 offset, u32 size); void BindTransformFeedbackBuffer(u32 index, VkBuffer buffer, u32 offset, u32 size);

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

@ -225,7 +225,10 @@ void RasterizerVulkan::PrepareDraw(bool is_indexed, Func&& draw_func) {
UpdateDynamicStates(); UpdateDynamicStates();
pipeline->SetPreBindCallback([this](vk::CommandBuffer cmdbuf) { RecordDynamicStates(cmdbuf); }); pipeline->SetPreBindCallback([this, is_indexed, pipeline](vk::CommandBuffer cmdbuf) {
RecordDynamicStates(cmdbuf);
buffer_cache.BindHostGeometryBuffers(is_indexed, pipeline->HasDynamicVertexInput(), &cmdbuf);
});
SCOPE_EXIT { pipeline->ClearPreBindCallback(); }; SCOPE_EXIT { pipeline->ClearPreBindCallback(); };
if (!pipeline->Configure(is_indexed)) if (!pipeline->Configure(is_indexed))