mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-07-08 22:13:37 +00:00
0dbe45ae37
* Fix various issues caused by #3679 - The arguments for the 0th dummy vertex buffer were incorrect - it was given an offset of 16 rather than a size of 16. - The wrong size was used when doing `autoBuffer.Get` on a converted vertex buffer. - The possibility of a vertex buffer being disposed and then rebound can rebindings to find a different buffer where the current range is out of bounds. Avoid binding when out of range to prevent validation errors. - The above also affects generation of converted buffers, which was a bit more fatal. Conversion functions now attempt to bound input offset/size. * Fix offset for converted buffer
103 lines
3.1 KiB
C#
103 lines
3.1 KiB
C#
using Silk.NET.Vulkan;
|
|
using System;
|
|
|
|
namespace Ryujinx.Graphics.Vulkan
|
|
{
|
|
internal struct IndexBufferState
|
|
{
|
|
public static IndexBufferState Null => new IndexBufferState(GAL.BufferHandle.Null, 0, 0);
|
|
|
|
private readonly int _offset;
|
|
private readonly int _size;
|
|
private readonly IndexType _type;
|
|
|
|
private readonly GAL.BufferHandle _handle;
|
|
private Auto<DisposableBuffer> _buffer;
|
|
|
|
public IndexBufferState(GAL.BufferHandle handle, int offset, int size, IndexType type)
|
|
{
|
|
_handle = handle;
|
|
_offset = offset;
|
|
_size = size;
|
|
_type = type;
|
|
_buffer = null;
|
|
}
|
|
|
|
public IndexBufferState(GAL.BufferHandle handle, int offset, int size)
|
|
{
|
|
_handle = handle;
|
|
_offset = offset;
|
|
_size = size;
|
|
_type = IndexType.Uint16;
|
|
_buffer = null;
|
|
}
|
|
|
|
public void BindIndexBuffer(VulkanRenderer gd, CommandBufferScoped cbs)
|
|
{
|
|
Auto<DisposableBuffer> autoBuffer;
|
|
int offset, size;
|
|
IndexType type = _type;
|
|
|
|
if (_type == IndexType.Uint8Ext && !gd.Capabilities.SupportsIndexTypeUint8)
|
|
{
|
|
// Index type is not supported. Convert to I16.
|
|
autoBuffer = gd.BufferManager.GetBufferI8ToI16(cbs, _handle, _offset, _size);
|
|
|
|
type = IndexType.Uint16;
|
|
offset = 0;
|
|
size = _size * 2;
|
|
}
|
|
else
|
|
{
|
|
autoBuffer = gd.BufferManager.GetBuffer(cbs.CommandBuffer, _handle, false, out int bufferSize);
|
|
|
|
if (_offset >= bufferSize)
|
|
{
|
|
autoBuffer = null;
|
|
}
|
|
|
|
offset = _offset;
|
|
size = _size;
|
|
}
|
|
|
|
_buffer = autoBuffer;
|
|
|
|
if (autoBuffer != null)
|
|
{
|
|
gd.Api.CmdBindIndexBuffer(cbs.CommandBuffer, autoBuffer.Get(cbs, offset, size).Value, (ulong)offset, type);
|
|
}
|
|
}
|
|
|
|
public void BindConvertedIndexBuffer(VulkanRenderer gd, CommandBufferScoped cbs, int firstIndex, int indexCount, int convertedCount, IndexBufferPattern pattern)
|
|
{
|
|
Auto<DisposableBuffer> autoBuffer;
|
|
|
|
// Convert the index buffer using the given pattern.
|
|
int indexSize = _type switch
|
|
{
|
|
IndexType.Uint32 => 4,
|
|
IndexType.Uint16 => 2,
|
|
_ => 1,
|
|
};
|
|
|
|
int firstIndexOffset = firstIndex * indexSize;
|
|
|
|
autoBuffer = gd.BufferManager.GetBufferTopologyConversion(cbs, _handle, _offset + firstIndexOffset, indexCount * indexSize, pattern, indexSize);
|
|
|
|
int size = convertedCount * 4;
|
|
|
|
_buffer = autoBuffer;
|
|
|
|
if (autoBuffer != null)
|
|
{
|
|
gd.Api.CmdBindIndexBuffer(cbs.CommandBuffer, autoBuffer.Get(cbs, 0, size).Value, 0, IndexType.Uint32);
|
|
}
|
|
}
|
|
|
|
public bool BoundEquals(Auto<DisposableBuffer> buffer)
|
|
{
|
|
return _buffer == buffer;
|
|
}
|
|
}
|
|
}
|