Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Vulkan: Batch vertex buffer updates #4843

Merged
merged 3 commits into from
May 8, 2023
Merged

Vulkan: Batch vertex buffer updates #4843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f590743
Vulkan: Batch vertex buffer updates
riperiperi Dec 27, 2022
b1ed769
Only rebind vertex buffers if they have changed
riperiperi May 7, 2023
5405793
Address feedback
riperiperi May 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 32 additions & 11 deletions src/Ryujinx.Graphics.Vulkan/PipelineBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ class PipelineBase : IDisposable
private ulong _vertexBuffersDirty;
protected Rectangle<int> ClearScissor;

private readonly VertexBufferUpdater _vertexBufferUpdater;

public SupportBufferUpdater SupportBufferUpdater;
public IndexBufferPattern QuadsToTrisPattern;
public IndexBufferPattern TriFanToTrisPattern;
Expand Down Expand Up @@ -96,6 +98,7 @@ public unsafe PipelineBase(VulkanRenderer gd, Device device)
gd.Api.CreatePipelineCache(device, pipelineCacheCreateInfo, null, out PipelineCache).ThrowOnError();

_descriptorSetUpdater = new DescriptorSetUpdater(gd, this);
_vertexBufferUpdater = new VertexBufferUpdater(gd);

_transformFeedbackBuffers = new BufferState[Constants.MaxTransformFeedbackBuffers];
_vertexBuffers = new VertexBufferState[Constants.MaxVertexBuffers + 1];
Expand Down Expand Up @@ -1185,6 +1188,9 @@ public void SetVertexBuffers(ReadOnlySpan<VertexBufferDescriptor> vertexBuffers)

int validCount = 1;

BufferHandle lastHandle = default;
Auto<DisposableBuffer> lastBuffer = default;

for (int i = 0; i < count; i++)
{
var vertexBuffer = vertexBuffers[i];
Expand All @@ -1194,7 +1200,12 @@ public void SetVertexBuffers(ReadOnlySpan<VertexBufferDescriptor> vertexBuffers)

if (vertexBuffer.Buffer.Handle != BufferHandle.Null)
{
var vb = Gd.BufferManager.GetBuffer(CommandBuffer, vertexBuffer.Buffer.Handle, false);
Auto<DisposableBuffer> vb = (vertexBuffer.Buffer.Handle == lastHandle) ? lastBuffer :
Gd.BufferManager.GetBuffer(CommandBuffer, vertexBuffer.Buffer.Handle, false);

lastHandle = vertexBuffer.Buffer.Handle;
lastBuffer = vb;

if (vb != null)
{
int binding = i + 1;
Expand Down Expand Up @@ -1222,24 +1233,29 @@ public void SetVertexBuffers(ReadOnlySpan<VertexBufferDescriptor> vertexBuffers)
ref var buffer = ref _vertexBuffers[binding];
int oldScalarAlign = buffer.AttributeScalarAlignment;

buffer.Dispose();

if (Gd.Capabilities.VertexBufferAlignment < 2 &&
(vertexBuffer.Stride % FormatExtensions.MaxBufferFormatScalarSize) == 0)
{
buffer = new VertexBufferState(
vb,
descriptorIndex,
vertexBuffer.Buffer.Offset,
vbSize,
vertexBuffer.Stride);
if (!buffer.Matches(vb, descriptorIndex, vertexBuffer.Buffer.Offset, vbSize, vertexBuffer.Stride))
{
buffer.Dispose();

buffer = new VertexBufferState(
vb,
descriptorIndex,
vertexBuffer.Buffer.Offset,
vbSize,
vertexBuffer.Stride);

buffer.BindVertexBuffer(Gd, Cbs, (uint)binding, ref _newState);
buffer.BindVertexBuffer(Gd, Cbs, (uint)binding, ref _newState, _vertexBufferUpdater);
}
}
else
{
// May need to be rewritten. Bind this buffer before draw.

buffer.Dispose();

buffer = new VertexBufferState(
vertexBuffer.Buffer.Handle,
descriptorIndex,
Expand All @@ -1255,6 +1271,8 @@ public void SetVertexBuffers(ReadOnlySpan<VertexBufferDescriptor> vertexBuffers)
}
}

_vertexBufferUpdater.Commit(Cbs);

_newState.VertexBindingDescriptionsCount = (uint)validCount;
SignalStateChange();
}
Expand Down Expand Up @@ -1596,10 +1614,12 @@ private void RecreatePipelineIfNeeded(PipelineBindPoint pbp)
{
int i = BitOperations.TrailingZeroCount(_vertexBuffersDirty);

_vertexBuffers[i].BindVertexBuffer(Gd, Cbs, (uint)i, ref _newState);
_vertexBuffers[i].BindVertexBuffer(Gd, Cbs, (uint)i, ref _newState, _vertexBufferUpdater);

_vertexBuffersDirty &= ~(1UL << i);
}

_vertexBufferUpdater.Commit(Cbs);
}

if (_stateDirty || Pbp != pbp)
Expand Down Expand Up @@ -1712,6 +1732,7 @@ protected virtual void Dispose(bool disposing)
_framebuffer?.Dispose();
_newState.Dispose();
_descriptorSetUpdater.Dispose();
_vertexBufferUpdater.Dispose();

for (int i = 0; i < _vertexBuffers.Length; i++)
{
Expand Down
39 changes: 8 additions & 31 deletions src/Ryujinx.Graphics.Vulkan/VertexBufferState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public VertexBufferState(BufferHandle handle, int descriptorIndex, int offset, i
AttributeScalarAlignment = 1;
}

public void BindVertexBuffer(VulkanRenderer gd, CommandBufferScoped cbs, uint binding, ref PipelineState state)
public void BindVertexBuffer(VulkanRenderer gd, CommandBufferScoped cbs, uint binding, ref PipelineState state, VertexBufferUpdater updater)
{
var autoBuffer = _buffer;

Expand All @@ -65,21 +65,7 @@ public void BindVertexBuffer(VulkanRenderer gd, CommandBufferScoped cbs, uint bi

var buffer = autoBuffer.Get(cbs, 0, newSize).Value;

if (gd.Capabilities.SupportsExtendedDynamicState)
{
gd.ExtendedDynamicStateApi.CmdBindVertexBuffers2(
cbs.CommandBuffer,
binding,
1,
buffer,
0,
(ulong)newSize,
(ulong)stride);
}
else
{
gd.Api.CmdBindVertexBuffers(cbs.CommandBuffer, binding, 1, buffer, 0);
}
updater.BindVertexBuffer(cbs, binding, buffer, 0, (ulong)newSize, (ulong)stride);

_buffer = autoBuffer;

Expand All @@ -106,21 +92,7 @@ public void BindVertexBuffer(VulkanRenderer gd, CommandBufferScoped cbs, uint bi
{
var buffer = autoBuffer.Get(cbs, _offset, _size).Value;

if (gd.Capabilities.SupportsExtendedDynamicState)
{
gd.ExtendedDynamicStateApi.CmdBindVertexBuffers2(
cbs.CommandBuffer,
binding,
1,
buffer,
(ulong)_offset,
(ulong)_size,
(ulong)_stride);
}
else
{
gd.Api.CmdBindVertexBuffers(cbs.CommandBuffer, binding, 1, buffer, (ulong)_offset);
}
updater.BindVertexBuffer(cbs, binding, buffer, (ulong)_offset, (ulong)_size, (ulong)_stride);
}
}

Expand All @@ -129,6 +101,11 @@ public bool BoundEquals(Auto<DisposableBuffer> buffer)
return _buffer == buffer;
}

public bool Matches(Auto<DisposableBuffer> buffer, int descriptorIndex, int offset, int size, int stride = 0)
{
return _buffer == buffer && DescriptorIndex == descriptorIndex && _offset == offset && _size == size && _stride == stride;
}

public void Swap(Auto<DisposableBuffer> from, Auto<DisposableBuffer> to)
{
if (_buffer == from)
Expand Down
84 changes: 84 additions & 0 deletions src/Ryujinx.Graphics.Vulkan/VertexBufferUpdater.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
using Silk.NET.Vulkan;
using System;

using VkBuffer = Silk.NET.Vulkan.Buffer;

namespace Ryujinx.Graphics.Vulkan
{
internal class VertexBufferUpdater : IDisposable
{
private VulkanRenderer _gd;

private uint _baseBinding;
private uint _count;

private NativeArray<VkBuffer> _buffers;
private NativeArray<ulong> _offsets;
private NativeArray<ulong> _sizes;
private NativeArray<ulong> _strides;

public VertexBufferUpdater(VulkanRenderer gd)
{
_gd = gd;

_buffers = new NativeArray<VkBuffer>(Constants.MaxVertexBuffers);
_offsets = new NativeArray<ulong>(Constants.MaxVertexBuffers);
_sizes = new NativeArray<ulong>(Constants.MaxVertexBuffers);
_strides = new NativeArray<ulong>(Constants.MaxVertexBuffers);
}

public void BindVertexBuffer(CommandBufferScoped cbs, uint binding, VkBuffer buffer, ulong offset, ulong size, ulong stride)
{
if (_count == 0)
{
_baseBinding = binding;
}
else if (_baseBinding + _count != binding)
{
Commit(cbs);
_baseBinding = binding;
gdkchan marked this conversation as resolved.
Show resolved Hide resolved
}

int index = (int)_count;

_buffers[index] = buffer;
_offsets[index] = offset;
_sizes[index] = size;
_strides[index] = stride;

_count++;
}

public unsafe void Commit(CommandBufferScoped cbs)
{
if (_count != 0)
{
if (_gd.Capabilities.SupportsExtendedDynamicState)
{
_gd.ExtendedDynamicStateApi.CmdBindVertexBuffers2(
cbs.CommandBuffer,
_baseBinding,
_count,
_buffers.Pointer,
_offsets.Pointer,
_sizes.Pointer,
_strides.Pointer);
}
else
{
_gd.Api.CmdBindVertexBuffers(cbs.CommandBuffer, _baseBinding, _count, _buffers.Pointer, _offsets.Pointer);
}

_count = 0;
}
}

public void Dispose()
{
_buffers.Dispose();
_offsets.Dispose();
_sizes.Dispose();
_strides.Dispose();
}
}
}