Jayden/sharpemu
1
0
Fork 0
mirror of https://github.com/par274/sharpemu.git synced 2026-07-30 22:49:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(agc): merge Prospero attrib-table formats onto IR vertex inputs (#556)

Browse Source 
IR-discovered BufferLoadFormat often keeps a stale float sharp format;
patch DataFormat/offset from the AGC attrib table (semantic index),
allow offen fetches, and map quirks 113/121 through NarrowVk for host
vertex input.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
MarcelMediaDev
2026-07-23 13:39:24 +01:00
committed by GitHub
parent 8779c96c3a
commit f9d92135a0
8 changed files with 1195 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SharpEmu.Libs/VideoOut/VulkanVideoPresenter.cs
+72 -13
View File
@@ -3170,6 +3170,7 @@ internal static unsafe class VulkanVideoPresenter
public uint NumberFormat;
public uint Stride;
public uint OffsetBytes;
public bool PerInstance;
}
private const Format DepthFormat = Format.D32Sfloat;
@@ -6658,33 +6659,47 @@ internal static unsafe class VulkanVideoPresenter
PName = entryPoint,
};
var vertexBindingDescriptions =
new VertexInputBindingDescription[resources.VertexBuffers.Length];
// One Vulkan binding per unique host buffer and input rate
// (fetch_index). Attributes share that binding with
// Offset = OffsetBytes.
var bindingByBuffer = new Dictionary<(ulong Handle, bool PerInstance), uint>();
var vertexBindingList = new List<VertexInputBindingDescription>();
var vertexAttributeDescriptions =
new VertexInputAttributeDescription[resources.VertexBuffers.Length];
for (var index = 0; index < resources.VertexBuffers.Length; index++)
{
var vertexBuffer = resources.VertexBuffers[index];
vertexBindingDescriptions[index] = new VertexInputBindingDescription
var bufferKey = (vertexBuffer.Buffer.Handle, vertexBuffer.PerInstance);
if (!bindingByBuffer.TryGetValue(bufferKey, out var bindingIndex))
{
Binding = (uint)index,
Stride = vertexBuffer.Stride == 0
? Math.Max(vertexBuffer.ComponentCount, 1) * sizeof(float)
: vertexBuffer.Stride,
InputRate = VertexInputRate.Vertex,
};
bindingIndex = (uint)vertexBindingList.Count;
bindingByBuffer[bufferKey] = bindingIndex;
vertexBindingList.Add(new VertexInputBindingDescription
{
Binding = bindingIndex,
Stride = vertexBuffer.Stride == 0
? Math.Max(vertexBuffer.ComponentCount, 1) * sizeof(float)
: vertexBuffer.Stride,
InputRate = vertexBuffer.PerInstance
? VertexInputRate.Instance
: VertexInputRate.Vertex,
});
}
vertexAttributeDescriptions[index] = new VertexInputAttributeDescription
{
Location = vertexBuffer.Location,
Binding = (uint)index,
Binding = bindingIndex,
Format = ToVkVertexFormat(
vertexBuffer.DataFormat,
vertexBuffer.NumberFormat,
vertexBuffer.ComponentCount),
Offset = 0,
Offset = vertexBuffer.OffsetBytes,
};
}
var vertexBindingDescriptions = vertexBindingList.ToArray();
fixed (VertexInputBindingDescription* vertexBindingPointerBase = vertexBindingDescriptions)
fixed (VertexInputAttributeDescription* vertexAttributePointerBase = vertexAttributeDescriptions)
{
@@ -9280,6 +9295,7 @@ internal static unsafe class VulkanVideoPresenter
NumberFormat = guestBuffer.NumberFormat,
Stride = guestBuffer.Stride,
OffsetBytes = guestBuffer.OffsetBytes,
PerInstance = guestBuffer.PerInstance,
};
}
@@ -9297,6 +9313,7 @@ internal static unsafe class VulkanVideoPresenter
NumberFormat = guestBuffer.NumberFormat,
Stride = guestBuffer.Stride,
OffsetBytes = guestBuffer.OffsetBytes,
PerInstance = guestBuffer.PerInstance,
};
private VkBuffer CreateHostBuffer(
@@ -9398,21 +9415,28 @@ internal static unsafe class VulkanVideoPresenter
private static Format ToVkVertexFormat(
uint dataFormat,
uint numberFormat,
uint componentCount) =>
(dataFormat, numberFormat) switch
uint componentCount)
{
var format = (dataFormat, numberFormat) switch
{
(1, 0) => Format.R8Unorm,
(1, 1) => Format.R8SNorm,
(1, 2) => Format.R8Uscaled,
(1, 3) => Format.R8Sscaled,
(1, 4) => Format.R8Uint,
(1, 5) => Format.R8Sint,
(1, 9) => Format.R8Srgb,
(2, 0) => Format.R16Unorm,
(2, 1) => Format.R16SNorm,
(2, 2) => Format.R16Uscaled,
(2, 3) => Format.R16Sscaled,
(2, 4) => Format.R16Uint,
(2, 5) => Format.R16Sint,
(2, 7) => Format.R16Sfloat,
(3, 0) => Format.R8G8Unorm,
(3, 1) => Format.R8G8SNorm,
(3, 2) => Format.R8G8Uscaled,
(3, 3) => Format.R8G8Sscaled,
(3, 4) => Format.R8G8Uint,
(3, 5) => Format.R8G8Sint,
(3, 9) => Format.R8G8Srgb,
@@ -9467,6 +9491,9 @@ internal static unsafe class VulkanVideoPresenter
(14, 4) => Format.R32G32B32A32Uint,
(14, 5) => Format.R32G32B32A32Sint,
(14, 7) => Format.R32G32B32A32Sfloat,
// Prospero VertexAttribFormat quirks also seen as buffer formats.
(113, _) => Format.R32G32B32A32Sfloat,
(121, _) => Format.R16G16Sfloat,
(16, 0) => Format.B5G6R5UnormPack16,
(17, 0) => Format.R5G5B5A1UnormPack16,
(19, 0) => Format.R4G4B4A4UnormPack16,
@@ -9474,6 +9501,38 @@ internal static unsafe class VulkanVideoPresenter
_ => ToVkFloatVertexFormat(componentCount),
};
return NarrowVkVertexFormat(format, componentCount);
}
/// <summary>
/// Narrow a sharp's full VkFormat to the component count the VS fetch
/// actually consumes.
/// </summary>
private static Format NarrowVkVertexFormat(Format format, uint usedComponents)
{
if (usedComponents == 0)
{
return format;
}
return (format, usedComponents) switch
{
(Format.R32G32B32A32Sfloat, 1) => Format.R32Sfloat,
(Format.R32G32B32A32Sfloat, 2) => Format.R32G32Sfloat,
(Format.R32G32B32A32Sfloat, 3) => Format.R32G32B32Sfloat,
(Format.R32G32B32Sfloat, 1) => Format.R32Sfloat,
(Format.R32G32B32Sfloat, 2) => Format.R32G32Sfloat,
(Format.R16G16B16A16Sfloat, 1) => Format.R16Sfloat,
(Format.R16G16B16A16Sfloat, 2) => Format.R16G16Sfloat,
(Format.R8G8B8A8Unorm, 1) => Format.R8Unorm,
(Format.R8G8B8A8Unorm, 2) => Format.R8G8Unorm,
(Format.R8G8B8A8SNorm, 2) => Format.R8G8SNorm,
(Format.R8G8B8A8Uint, 1) => Format.R8Uint,
(Format.R8G8B8A8Uint, 2) => Format.R8G8Uint,
_ => format,
};
}
private static Format ToVkFloatVertexFormat(uint componentCount) =>
componentCount switch
{