mirror of
https://github.com/ryujinx-mirror/ryujinx.git
synced 2024-12-23 14:54:00 +00:00
8fa248ceb4
* Add MVK basics. * Use appropriate output attribute types * 4kb vertex alignment, bunch of fixes * Add reduced shader precision mode for mvk. * Disable ASTC on MVK for now * Only request robustnes2 when it is available. * It's just the one feature actually * Add triangle fan conversion * Allow NullDescriptor on MVK for some reason. * Force safe blit on MoltenVK * Use ASTC only when formats are all available. * Disable multilevel 3d texture views * Filter duplicate render targets (on backend) * Add Automatic MoltenVK Configuration * Do not create color attachment views with formats that are not RT compatible * Make sure that the host format matches the vertex shader input types for invalid/unknown guest formats * FIx rebase for Vertex Attrib State * Fix 4b alignment for vertex * Use asynchronous queue submits for MVK * Ensure color clear shader has correct output type * Update MoltenVK config * Always use MoltenVK workarounds on MacOS * Make MVK supersede all vendors * Fix rebase * Various fixes on rebase * Get portability flags from extension * Fix some minor rebasing issues * Style change * Use LibraryImport for MVKConfiguration * Rename MoltenVK vendor to Apple Intel and AMD GPUs on moltenvk report with the those vendors - only apple silicon reports with vendor 0x106B. * Fix features2 rebase conflict * Rename fragment output type * Add missing check for fragment output types Might have caused the crash in MK8 * Only do fragment output specialization on MoltenVK * Avoid copy when passing capabilities * Self feedback * Address feedback Co-authored-by: gdk <gab.dark.100@gmail.com> Co-authored-by: nastys <nastys@users.noreply.github.com>
143 lines
4.7 KiB
C#
143 lines
4.7 KiB
C#
using BufferHandle = Ryujinx.Graphics.GAL.BufferHandle;
|
|
|
|
namespace Ryujinx.Graphics.Vulkan
|
|
{
|
|
internal struct VertexBufferState
|
|
{
|
|
public static VertexBufferState Null => new VertexBufferState(null, 0, 0, 0);
|
|
|
|
private readonly int _offset;
|
|
private readonly int _size;
|
|
private readonly int _stride;
|
|
|
|
private readonly BufferHandle _handle;
|
|
private Auto<DisposableBuffer> _buffer;
|
|
|
|
internal readonly int DescriptorIndex;
|
|
internal int AttributeScalarAlignment;
|
|
|
|
public VertexBufferState(Auto<DisposableBuffer> buffer, int descriptorIndex, int offset, int size, int stride = 0)
|
|
{
|
|
_buffer = buffer;
|
|
_handle = BufferHandle.Null;
|
|
|
|
_offset = offset;
|
|
_size = size;
|
|
_stride = stride;
|
|
|
|
DescriptorIndex = descriptorIndex;
|
|
AttributeScalarAlignment = 1;
|
|
|
|
buffer?.IncrementReferenceCount();
|
|
}
|
|
|
|
public VertexBufferState(BufferHandle handle, int descriptorIndex, int offset, int size, int stride = 0)
|
|
{
|
|
// This buffer state may be rewritten at bind time, so it must be retrieved on bind.
|
|
|
|
_buffer = null;
|
|
_handle = handle;
|
|
|
|
_offset = offset;
|
|
_size = size;
|
|
_stride = stride;
|
|
|
|
DescriptorIndex = descriptorIndex;
|
|
AttributeScalarAlignment = 1;
|
|
}
|
|
|
|
public void BindVertexBuffer(VulkanRenderer gd, CommandBufferScoped cbs, uint binding, ref PipelineState state)
|
|
{
|
|
var autoBuffer = _buffer;
|
|
|
|
if (_handle != BufferHandle.Null)
|
|
{
|
|
// May need to restride the vertex buffer.
|
|
|
|
if (gd.NeedsVertexBufferAlignment(AttributeScalarAlignment, out int alignment) && (_stride % alignment) != 0)
|
|
{
|
|
autoBuffer = gd.BufferManager.GetAlignedVertexBuffer(cbs, _handle, _offset, _size, _stride, alignment);
|
|
|
|
if (autoBuffer != null)
|
|
{
|
|
int stride = (_stride + (alignment - 1)) & -alignment;
|
|
int newSize = (_size / _stride) * stride;
|
|
|
|
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);
|
|
}
|
|
|
|
_buffer = autoBuffer;
|
|
|
|
state.Internal.VertexBindingDescriptions[DescriptorIndex].Stride = (uint)stride;
|
|
}
|
|
|
|
return;
|
|
}
|
|
else
|
|
{
|
|
autoBuffer = gd.BufferManager.GetBuffer(cbs.CommandBuffer, _handle, false, out int size);
|
|
|
|
// The original stride must be reapplied in case it was rewritten.
|
|
state.Internal.VertexBindingDescriptions[DescriptorIndex].Stride = (uint)_stride;
|
|
|
|
if (_offset >= size)
|
|
{
|
|
autoBuffer = null;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (autoBuffer != null)
|
|
{
|
|
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);
|
|
}
|
|
}
|
|
}
|
|
|
|
public bool BoundEquals(Auto<DisposableBuffer> buffer)
|
|
{
|
|
return _buffer == buffer;
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
// Only dispose if this buffer is not refetched on each bind.
|
|
|
|
if (_handle == BufferHandle.Null)
|
|
{
|
|
_buffer?.DecrementReferenceCount();
|
|
}
|
|
}
|
|
}
|
|
}
|