mirror of
https://github.com/par274/sharpemu.git
synced 2026-07-27 21:21:56 +08:00
db4339f698
* fix(kernel): implement APR ResolveFilepathsWithPrefixToIdsAndFileSizes Resource streamers resolve relative paths against a shared prefix; without this HLE every call returned NOT_FOUND and assets never got real ids/sizes. * fix(remoteplay): stub Initialize and GetConnectionStatus as disconnected Titles probe Remote Play during pad/network bring-up; unresolved imports returned NOT_FOUND. Report initialized + disconnected so callers take the normal offline path. * fix(agc): accept Gen5 hull shaders that omit PGM_LO/HI in CreateShader Type-5 headers can start with RSRC1/RSRC2; rejecting them left null handles and Main Thread AVs. Scan the SH table and skip PGM patch when absent. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(kernel): reject getdents on file fds and emit . / .. for empty dirs Returning rax=0 for non-directory or empty listings looked like EOF and let GTA treat the fd as a pointer (fiWriteAsyncDataWorker AV at 0xB1). * fix(hle): enable GuestImageWriteTracker CPU sync on Windows Windows previously hard-disabled the tracker, so CPU-written guest planes never marked dirty and host textures stayed empty. Arm pages with VirtualProtect, handle write AVs in VEH, and warm/test on VirtualAlloc memory so protect cannot poison the CRT heap. * fix(agc): skip CB metadata draws for EliminateFastClear/Fmask/DCC CB_COLOR_CONTROL modes 2/5/6 are colour-buffer metadata ops; applying the bound shader as a normal colour draw corrupts subsequent composites. Decode MODE from bits [6:4] and return before translate. * fix(agc): merge Prospero attrib-table formats onto IR vertex inputs 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. * fix(audio): harden AudioOut2 stack out-buffer writes against canary smash Titles that stack-allocate AudioOut2 outs next to the frame canary were corrupted by oversized or mistyped HLE writes; keep ContextPush pacing. * Revert "fix(memory): reserve only large regions (#608)" This reverts commit8f9456229a. * fix(gpu): decode Gen5 R16 and RG32 render-target formats * fix(audio): AudioOut2 host beds, deeper waveOut queue, AJM MP3 GTA V Enhanced routes intro/menu audio through AudioOut2 and FMOD's AJM MP3 path. Wire PortCreate/PortSetAttributes/ContextPush to dual host stereo streams, deepen WinMM queue to 128KiB, and decode AJM codec 0 with a stateful NLayer helper so menu music is not silent. * fix(agc): map PS interpolants via SPI_PS_INPUT_CNTL semantics Identity ATTR→param wiring ignored hardware remapping, so UI draws got wrong (or empty) interpolants. Pack CNTL from matched PS/GS semantics, thread it into Vulkan/Metal as Location/Flat, and fingerprint it in the graphics shader cache key. * fix(agc): rect-list/NGG strips, Index8 expand, and GE_INDX_OFFSET NGG single-rect UI needs triangle-strip expansion; Prospero Index8 must expand to host u16; glyphs need base vertex from GE_INDX_OFFSET. Skip param-less rect-lists instead of inventing colour draws. * fix(np): report GTA Story Mode addcont entitlements as owned NpEntitlementAccess was returning an empty add-on list, so GTA V Enhanced offered Buy Story Mode. Publish the installed license labels and stub premium-event registration so offline sessions take the owned path. * fix(cpu): prefer native workers for all guest entry stubs Route thread entry, continuation, and main entry through RunGuestEntryStub so guest stubs are not invoked above CLR-managed frames (UnmanagedCallersOnly FailFast). Keep requireNativeWorker for tbb_thead; other paths prefer workers with calli fallback. * fix(agc): implement Rewind/Jump writers and IT_REWIND waits GTA Subrender AVs came from AcbJumpGetSize / DcbRewind returning NOT_FOUND as packet sizes. Add IT_REWIND and INDIRECT_BUFFER writers, patch SetRewindState into the GPU wait registry, and nest-parse 4-dword jumps. * fix(gpu): use AddrLib ExactXor for Gen5 Standard256B (mode 1) Mode 5 already had Standard4K ExactXor; mode 1 still used the generic StandardSwizzle block table, which mis-detiles Gen5 UI atlases. * Revert "fix(cpu): prefer native workers for all guest entry stubs" This reverts commit31c4db0d38. * fix(memory): commit-first large maps; reserve only on failure Replace the #608 always-reserve-only exact-map path with allocate-first and lazy reserve fallback when a huge non-exec commit cannot be satisfied. Prime and widen GetPointer commit so the fallback path is safer for native walkers. Drops the need for a hard #608 revert. * [Agc] Implement fused shader half exports * fix(agc): accept optional hull state in CreatePrimState Port the CreatePrimState hull-optional path from #583 so fused HS pipelines (GTA) are not rejected with INVALID_ARGUMENT. Geometry-derived CX/UC writes are unchanged; hull is traced only. * fix(videoout): restore thread-safe VulkanHostBufferPool (#564) The6db095ewipe dropped CasualcoderDev's lock-ordering-safe pool. Concurrent Return/TryTake without the gate races after the first present and can hang the submit path. * Revert "fix(agc): implement Rewind/Jump writers and IT_REWIND waits" This reverts commitbec77bf083. * test(memory): align lazy-commit expectations with commit-first policy Fake hosts must reject Allocate so reserve-only paths still run, and GetPointer asserts the 32 MiB prime range including AlignUp spill. * diag(gpu): log guest-queue backlog breakdown under backpressure Rate-limit top work types and ordered debugName prefixes when the Vulkan guest work queue stalls, so North Yankton logs show acquire/label vs draw traffic instead of only VulkanOrderedGuestAction. * perf(agc): coalesce acquire flushes and batch non-DMA label wakes Flush pending ACQUIRE_MEM invalidation at draw/dispatch/dma/flip boundaries instead of before every packet, and complete release/write-data producers in the same ordered action so load paths enqueue far fewer VulkanOrderedGuestAction items. * perf(gpu): wait for ordered-action fences and keep draining sync On Windows/Linux, block briefly for queue-visibility fences instead of deferring the whole logical queue for the tick. Prefer ordered sync/flip heads under backlog pressure, and keep macOS non-blocking defer behavior. * perf(gpu): raise sync-item ceiling above payload guest-work cap Apply SHARPEMU_PENDING_GUEST_WORK_ITEMS mainly to compute/draw/image payload work, and allow a higher SHARPEMU_PENDING_GUEST_SYNC_ITEMS ceiling for zero-payload ordered actions and flip markers. Keep the byte budget as the RAM safety valve. * fix(gta): stub Voice ports and implement sceKernelCheckReachability Resolve North Yankton-path Voice Create/Delete/Connect/Disconnect/End NIDs and EnumerationThread reachability checks so leftover unresolved imports are not on the critical path. * diag(gta): arm flip/present/wait probes after North Audio Rate-limited load_progress TRACE for flip submit, ordered flip enqueue, present taken/not-taken, and GPU wait backlog so North Yankton freezes can be classified without full AGC tracing. * fix(ampr): restore sequential offset=-1 reads for streamer packs Re-wire PakDirectoryTracker into sceAmprAprCommandBufferReadFile (dropped in #216) so RAGE sequential pack reads no longer fail while the North Yankton UI keeps flipping. Also rate-limit CheckReachability miss paths for EnumerationThread diagnosis. * fix(hle/videoout): Windows GuestImage opt-in and keep GTA intro without sync Default the tracker off on Windows to avoid VirtualProtect thrash, gate AGC texel-copy skips on Enabled so guest Bink planes keep shipping pixels, and drain CPU-written images on the present thread when sync is opted in. * fix(videoout): probe guest content when tracker off so UI can skip copies Restores upload-known/texture-cache skips for Dead Cells menus, and uses a sparse guest-memory fingerprint when GuestImageWriteTracker is disabled so CPU-updated Bink planes still force texel copies for GTA intro. * fix(audio): keep 128KiB host queue AudioOut2-only Restore the default 32 KiB (~171 ms) PCM bed for classic AudioOut so titles like Dreaming Sarah stay in sync; only AudioOut2 opens the deeper queue needed for bursty FMOD Push on GTA. --------- Co-authored-by: samto6 <123419830+samto6@users.noreply.github.com>
418 lines
12 KiB
C#
418 lines
12 KiB
C#
// Copyright (C) 2026 SharpEmu Emulator Project
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
namespace SharpEmu.ShaderCompiler;
|
|
|
|
public enum Gen5ShaderEncoding
|
|
{
|
|
Sop1,
|
|
Sop2,
|
|
Sopc,
|
|
Sopp,
|
|
Sopk,
|
|
Smrd,
|
|
Smem,
|
|
Mubuf,
|
|
Mtbuf,
|
|
Vop1,
|
|
Vop2,
|
|
Vopc,
|
|
Vop3,
|
|
Vintrp,
|
|
Ds,
|
|
Flat,
|
|
Vop3p,
|
|
Mimg,
|
|
Exp,
|
|
}
|
|
|
|
public enum Gen5OperandKind
|
|
{
|
|
ScalarRegister,
|
|
VectorRegister,
|
|
EncodedConstant,
|
|
LiteralConstant,
|
|
}
|
|
|
|
public enum Gen5ShaderResourceKind
|
|
{
|
|
ReadOnlyTexture,
|
|
ReadWriteTexture,
|
|
Sampler,
|
|
ConstantBuffer,
|
|
}
|
|
|
|
public enum Gen5PixelOutputKind
|
|
{
|
|
Float,
|
|
Uint,
|
|
Sint,
|
|
}
|
|
|
|
public readonly record struct Gen5PixelOutputBinding(
|
|
uint GuestSlot,
|
|
uint HostLocation,
|
|
Gen5PixelOutputKind Kind);
|
|
|
|
public readonly record struct Gen5ShaderResourceMapping(
|
|
Gen5ShaderResourceKind Kind,
|
|
uint Slot,
|
|
uint OffsetDwords,
|
|
bool SizeFlag);
|
|
|
|
public sealed record Gen5ShaderMetadata(
|
|
uint ExtendedUserDataSizeDwords,
|
|
uint ShaderResourceTableSizeDwords,
|
|
IReadOnlyDictionary<uint, uint> DirectResources,
|
|
IReadOnlyList<Gen5ShaderResourceMapping> Resources);
|
|
|
|
public readonly record struct Gen5ComputeSystemRegisters(
|
|
uint? WorkGroupXRegister,
|
|
uint? WorkGroupYRegister,
|
|
uint? WorkGroupZRegister,
|
|
uint? ThreadGroupSizeRegister)
|
|
{
|
|
public bool TryGetExpression(uint scalarRegister, out string expression)
|
|
{
|
|
if (WorkGroupXRegister == scalarRegister)
|
|
{
|
|
expression = "gl_WorkGroupID.x";
|
|
return true;
|
|
}
|
|
|
|
if (WorkGroupYRegister == scalarRegister)
|
|
{
|
|
expression = "gl_WorkGroupID.y";
|
|
return true;
|
|
}
|
|
|
|
if (WorkGroupZRegister == scalarRegister)
|
|
{
|
|
expression = "gl_WorkGroupID.z";
|
|
return true;
|
|
}
|
|
|
|
if (ThreadGroupSizeRegister == scalarRegister)
|
|
{
|
|
expression = "(gl_WorkGroupSize.x * gl_WorkGroupSize.y * gl_WorkGroupSize.z)";
|
|
return true;
|
|
}
|
|
|
|
expression = string.Empty;
|
|
return false;
|
|
}
|
|
|
|
public void ClearStaticValues(Span<uint> scalarRegisters)
|
|
{
|
|
ClearStaticValue(scalarRegisters, WorkGroupXRegister);
|
|
ClearStaticValue(scalarRegisters, WorkGroupYRegister);
|
|
ClearStaticValue(scalarRegisters, WorkGroupZRegister);
|
|
ClearStaticValue(scalarRegisters, ThreadGroupSizeRegister);
|
|
}
|
|
|
|
private static void ClearStaticValue(Span<uint> scalarRegisters, uint? scalarRegister)
|
|
{
|
|
if (scalarRegister is { } register && register < scalarRegisters.Length)
|
|
{
|
|
scalarRegisters[(int)register] = 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
public sealed record Gen5ShaderState(
|
|
Gen5ShaderProgram Program,
|
|
IReadOnlyList<uint> UserData,
|
|
Gen5ShaderMetadata? Metadata,
|
|
Gen5ComputeSystemRegisters? ComputeSystemRegisters = null,
|
|
uint UserDataScalarRegisterBase = 0);
|
|
|
|
public readonly record struct Gen5Operand(Gen5OperandKind Kind, uint Value)
|
|
{
|
|
public static Gen5Operand Scalar(uint index) =>
|
|
new(Gen5OperandKind.ScalarRegister, index);
|
|
|
|
public static Gen5Operand Vector(uint index) =>
|
|
new(Gen5OperandKind.VectorRegister, index);
|
|
|
|
public static Gen5Operand Source(uint encoded, uint? literal = null)
|
|
{
|
|
if (encoded >= 256)
|
|
{
|
|
return Vector(encoded - 256);
|
|
}
|
|
|
|
if (encoded is 249 or 255 && literal.HasValue)
|
|
{
|
|
return new(Gen5OperandKind.LiteralConstant, literal.Value);
|
|
}
|
|
|
|
if (encoded <= 105 || encoded is 106 or 107 or 124 or 126 or 127)
|
|
{
|
|
return Scalar(encoded);
|
|
}
|
|
|
|
return new(Gen5OperandKind.EncodedConstant, encoded);
|
|
}
|
|
|
|
public override string ToString() => Kind switch
|
|
{
|
|
Gen5OperandKind.ScalarRegister => $"s{Value}",
|
|
Gen5OperandKind.VectorRegister => $"v{Value}",
|
|
Gen5OperandKind.LiteralConstant => $"0x{Value:X8}",
|
|
_ => $"src[{Value}]",
|
|
};
|
|
}
|
|
|
|
public abstract record Gen5InstructionControl;
|
|
|
|
public sealed record Gen5ImageControl(
|
|
uint Dmask,
|
|
uint VectorAddress,
|
|
IReadOnlyList<uint> AddressRegisters,
|
|
uint VectorData,
|
|
uint ScalarResource,
|
|
uint ScalarSampler,
|
|
uint Dimension,
|
|
bool IsArray,
|
|
bool Glc,
|
|
bool Slc,
|
|
bool A16,
|
|
bool D16) : Gen5InstructionControl
|
|
{
|
|
public uint GetAddressRegister(int component) =>
|
|
component < AddressRegisters.Count
|
|
? AddressRegisters[component]
|
|
: VectorAddress + (uint)component;
|
|
}
|
|
|
|
public sealed record Gen5GlobalMemoryControl(
|
|
uint DwordCount,
|
|
uint VectorAddress,
|
|
uint VectorData,
|
|
uint ScalarAddress,
|
|
int OffsetBytes,
|
|
bool Glc,
|
|
bool Slc,
|
|
bool UsesFlatAddress = false) : Gen5InstructionControl;
|
|
|
|
public sealed record Gen5BufferMemoryControl(
|
|
uint DwordCount,
|
|
uint VectorAddress,
|
|
uint VectorData,
|
|
uint ScalarResource,
|
|
int OffsetBytes,
|
|
bool IndexEnabled,
|
|
bool OffsetEnabled,
|
|
bool Glc,
|
|
bool Slc) : Gen5InstructionControl;
|
|
|
|
public sealed record Gen5ExportControl(
|
|
uint Target,
|
|
uint EnableMask,
|
|
bool Compressed,
|
|
bool Done,
|
|
bool ValidMask) : Gen5InstructionControl;
|
|
|
|
public sealed record Gen5InterpolationControl(
|
|
uint Attribute,
|
|
uint Channel) : Gen5InstructionControl;
|
|
|
|
public sealed record Gen5Vop3Control(
|
|
uint AbsoluteMask,
|
|
uint NegateMask,
|
|
uint OutputModifier,
|
|
bool Clamp,
|
|
uint OperandSelect,
|
|
uint? ScalarDestination) : Gen5InstructionControl;
|
|
|
|
public sealed record Gen5SdwaControl(
|
|
uint DestinationSelect,
|
|
uint DestinationUnused,
|
|
uint Source0Select,
|
|
uint Source1Select,
|
|
bool Source0SignExtend,
|
|
bool Source1SignExtend,
|
|
uint AbsoluteMask,
|
|
uint NegateMask,
|
|
uint OutputModifier,
|
|
bool Clamp,
|
|
uint? ScalarDestination) : Gen5InstructionControl;
|
|
|
|
// Packed (VOP3P) source and destination modifiers. Each mask holds one bit per
|
|
// source operand. OpSel/OpSelHi pick which 16-bit half of a source feeds the low
|
|
// and high result lanes respectively; NegLo/NegHi negate the value routed to each
|
|
// lane. Clamp saturates each output half to [0, 1].
|
|
public sealed record Gen5Vop3pControl(
|
|
uint OpSelMask,
|
|
uint OpSelHiMask,
|
|
uint NegLoMask,
|
|
uint NegHiMask,
|
|
bool Clamp) : Gen5InstructionControl;
|
|
|
|
public sealed record Gen5DppControl(
|
|
uint Control,
|
|
bool FetchInactive,
|
|
bool BoundControl,
|
|
uint AbsoluteMask,
|
|
uint NegateMask,
|
|
uint BankMask,
|
|
uint RowMask) : Gen5InstructionControl;
|
|
|
|
public sealed record Gen5Dpp8Control(
|
|
uint LaneSelectors,
|
|
bool FetchInactive) : Gen5InstructionControl;
|
|
|
|
public sealed record Gen5ScalarMemoryControl(
|
|
uint DestinationCount,
|
|
int ImmediateOffsetBytes,
|
|
uint? DynamicOffsetRegister) : Gen5InstructionControl;
|
|
|
|
public sealed record Gen5DataShareControl(
|
|
uint Offset0,
|
|
uint Offset1,
|
|
bool Gds) : Gen5InstructionControl;
|
|
|
|
public sealed record Gen5ImageBinding(
|
|
uint Pc,
|
|
string Opcode,
|
|
Gen5ImageControl Control,
|
|
IReadOnlyList<uint> ResourceDescriptor,
|
|
IReadOnlyList<uint> SamplerDescriptor,
|
|
uint? MipLevel);
|
|
|
|
// Data arrays may be rented from ArrayPool (oversized): always slice with
|
|
// DataLength, never Data.Length. Ownership transfers to the presenter, which
|
|
// returns pooled arrays after uploading them into host-visible buffers.
|
|
public sealed record Gen5GlobalMemoryBinding(
|
|
uint ScalarAddress,
|
|
ulong BaseAddress,
|
|
IReadOnlyList<uint> InstructionPcs,
|
|
byte[] Data,
|
|
int DataLength,
|
|
bool DataPooled)
|
|
{
|
|
public bool Writable { get; set; }
|
|
|
|
// Writable describes shader access and is also used to decide whether a
|
|
// compute dispatch has observable work. A statically reachable resource
|
|
// can nevertheless be unbound for the current scalar path; the evaluator
|
|
// supplies zero-filled storage for Vulkan in that case. Such synthetic
|
|
// storage must remain shader-writable, but must never be copied to the
|
|
// descriptor's unmapped guest address.
|
|
public bool WriteBackToGuest { get; set; } = true;
|
|
}
|
|
|
|
public sealed record Gen5VertexInputBinding(
|
|
uint Pc,
|
|
uint Location,
|
|
uint ComponentCount,
|
|
uint DataFormat,
|
|
uint NumberFormat,
|
|
ulong BaseAddress,
|
|
uint Stride,
|
|
uint OffsetBytes,
|
|
byte[] Data,
|
|
int DataLength,
|
|
bool DataPooled,
|
|
bool PerInstance = false);
|
|
|
|
public sealed record Gen5ShaderEvaluation(
|
|
IReadOnlyList<uint> InitialScalarRegisters,
|
|
IReadOnlyList<uint> ScalarRegisters,
|
|
IReadOnlyList<Gen5ImageBinding> ImageBindings,
|
|
IReadOnlyList<Gen5GlobalMemoryBinding> GlobalMemoryBindings,
|
|
Gen5ComputeSystemRegisters? ComputeSystemRegisters = null,
|
|
IReadOnlySet<uint>? RuntimeScalarRegisters = null,
|
|
IReadOnlyList<Gen5VertexInputBinding>? VertexInputs = null);
|
|
|
|
public sealed record Gen5ShaderInstruction(
|
|
uint Pc,
|
|
Gen5ShaderEncoding Encoding,
|
|
string Opcode,
|
|
IReadOnlyList<uint> Words,
|
|
IReadOnlyList<Gen5Operand> Sources,
|
|
IReadOnlyList<Gen5Operand> Destinations,
|
|
Gen5InstructionControl? Control);
|
|
|
|
public sealed record Gen5ShaderProgram(
|
|
ulong Address,
|
|
IReadOnlyList<Gen5ShaderInstruction> Instructions)
|
|
{
|
|
private const uint PixelColorTargetCount = 8;
|
|
private const int PixelColorMaskBits = 4;
|
|
private readonly uint _pixelColorExportMasks = ComputePixelColorExportMasks(Instructions);
|
|
private const int ScalarRegisterCount = 256;
|
|
private IReadOnlySet<uint>? _runtimeScalarRegisters;
|
|
|
|
public uint PixelColorExportMasks => _pixelColorExportMasks;
|
|
|
|
private static uint ComputePixelColorExportMasks(
|
|
IReadOnlyList<Gen5ShaderInstruction> instructions)
|
|
{
|
|
var masks = 0u;
|
|
foreach (var instruction in instructions)
|
|
{
|
|
if (instruction.Control is Gen5ExportControl export &&
|
|
export.Target < PixelColorTargetCount)
|
|
{
|
|
masks |= (export.EnableMask & 0xFu) <<
|
|
(int)(export.Target * PixelColorMaskBits);
|
|
}
|
|
}
|
|
|
|
return masks;
|
|
}
|
|
|
|
public IEnumerable<Gen5ImageControl> ImageResources =>
|
|
Instructions
|
|
.Select(instruction => instruction.Control)
|
|
.OfType<Gen5ImageControl>();
|
|
|
|
/// <summary>
|
|
/// The set of scalar registers the program reads or writes as runtime
|
|
/// values. It depends only on the (cached) decoded program, so it is
|
|
/// computed once and shared read-only across every draw that uses this
|
|
/// shader — the evaluator previously rebuilt this HashSet by scanning
|
|
/// every instruction on every draw, one of the largest per-draw
|
|
/// allocation and CPU sources.
|
|
/// </summary>
|
|
public IReadOnlySet<uint> RuntimeScalarRegisters =>
|
|
_runtimeScalarRegisters ??= ComputeRuntimeScalarRegisters();
|
|
|
|
private IReadOnlySet<uint> ComputeRuntimeScalarRegisters()
|
|
{
|
|
var registers = new HashSet<uint>();
|
|
foreach (var instruction in Instructions)
|
|
{
|
|
foreach (var operand in instruction.Sources)
|
|
{
|
|
if (operand.Kind == Gen5OperandKind.ScalarRegister &&
|
|
operand.Value < ScalarRegisterCount)
|
|
{
|
|
registers.Add(operand.Value);
|
|
}
|
|
}
|
|
|
|
foreach (var operand in instruction.Destinations)
|
|
{
|
|
if (operand.Kind == Gen5OperandKind.ScalarRegister &&
|
|
operand.Value < ScalarRegisterCount)
|
|
{
|
|
registers.Add(operand.Value);
|
|
}
|
|
}
|
|
|
|
if (instruction.Control is Gen5ScalarMemoryControl
|
|
{
|
|
DynamicOffsetRegister: { } offsetRegister,
|
|
} &&
|
|
offsetRegister < ScalarRegisterCount)
|
|
{
|
|
registers.Add(offsetRegister);
|
|
}
|
|
}
|
|
|
|
return registers;
|
|
}
|
|
}
|