Superredstone/Kenji-NX
1
0
Fork 0
mirror of https://git.ryujinx.app/projects/Kenji-NX.git synced 2026-10-06 15:08:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: Superredstone/Kenji-NX:macOS/vk-kosmickrisp
Branches Tags
Superredstone/Kenji-NX:master Superredstone/Kenji-NX:vk/dynamic-states-v2 Superredstone/Kenji-NX:libryujinx_bionic Superredstone/Kenji-NX:og-rebase/gdkchan Superredstone/Kenji-NX:macOS/vk-kosmickrisp Superredstone/Kenji-NX:feature/custom-config Superredstone/Kenji-NX:feature/renderdoc_api Superredstone/Kenji-NX:og/global-memory Superredstone/Kenji-NX:og-rebase/app_native_aot
Superredstone/Kenji-NX:2.0.5 Superredstone/Kenji-NX:2.0.4 Superredstone/Kenji-NX:2.0.3 Superredstone/Kenji-NX:2.0.2 Superredstone/Kenji-NX:2.0.1
..
compare: Superredstone/Kenji-NX:cf6ed01bb93b65d7223f8f847298a590b7a92ecf
Branches Tags
Superredstone/Kenji-NX:vk/dynamic-states-v2 Superredstone/Kenji-NX:master Superredstone/Kenji-NX:libryujinx_bionic Superredstone/Kenji-NX:og-rebase/gdkchan Superredstone/Kenji-NX:macOS/vk-kosmickrisp Superredstone/Kenji-NX:feature/custom-config Superredstone/Kenji-NX:feature/renderdoc_api Superredstone/Kenji-NX:og/global-memory Superredstone/Kenji-NX:og-rebase/app_native_aot
Superredstone/Kenji-NX:2.0.5 Superredstone/Kenji-NX:2.0.4 Superredstone/Kenji-NX:2.0.3 Superredstone/Kenji-NX:2.0.2 Superredstone/Kenji-NX:2.0.1
9 Commits
macOS/vk-kosmickrisp .. cf6ed01bb9
Author SHA1 Message Date
gdkchan cf6ed01bb9 Start building more accurate vertex as compute usage info 
- Fixes
 2026-08-21 12:38:12 -05:00
gdkchan fdfe8d276a Flip viewport based on screen scissor when Y negate is enabled 2026-08-21 12:38:12 -05:00
gdkchan 416372bdc7 Single block mode for LightningJit 2026-08-21 12:38:11 -05:00
gdkchan 00fc037bfd Do not set render targets as modified for discard-only draws 
- Shader cache version bump
 2026-08-21 12:38:11 -05:00
gdkchan bd78dada19 Prevent waits with zero timeout on Turnip 2026-08-21 12:38:11 -05:00
gdkchan 99256e44d7 Implement PRMT shader instruction 2026-08-21 12:38:11 -05:00
gdkchan d7f23ca6d1 Precise tracking of current PC address 2026-08-21 12:38:11 -05:00
gdkchan c5a0818b22 Implement buffer texture alignment 2026-08-21 12:38:11 -05:00
gdkchan 1868b4d95b Add an alternative queue, used on macOS to work around SPIRV-Cross stack overflows 
- Increase stack size to 2MB
 2026-08-21 12:38:10 -05:00
152 changed files with 1520 additions and 3258 deletions
Expand all files Collapse all files
Directory.Packages.props
+12 -13
View File
@@ -3,25 +3,25 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Avalonia" Version="12.1.2" />
<PackageVersion Include="Avalonia" Version="12.1.1" />
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="12.1.2" />
<PackageVersion Include="Avalonia.Desktop" Version="12.1.2" />
<PackageVersion Include="Avalonia.Desktop" Version="12.1.1" />
<PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.3" />
<PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="12.1.2" />
<PackageVersion Include="Svg.Controls.Avalonia" Version="12.0.0.17" />
<PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="12.0.0.17" />
<PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="12.1.1" />
<PackageVersion Include="Svg.Controls.Avalonia" Version="12.0.0.13" />
<PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="12.0.0.13" />
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
<PackageVersion Include="Concentus" Version="2.2.2" />
<PackageVersion Include="DiscordRichPresence" Version="1.6.1.70" />
<PackageVersion Include="DynamicData" Version="9.4.33" />
<PackageVersion Include="FluentAvaloniaUI" Version="3.1.0" />
<PackageVersion Include="FluentAvaloniaUI" Version="3.0.2" />
<PackageVersion Include="Gommon" Version="2.8.1.2" />
<PackageVersion Include="Humanizer" Version="3.0.10" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.22.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.10.0" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.21.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
<PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
<PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
<PackageVersion Include="NetCoreServer" Version="8.0.7" />
@@ -36,10 +36,8 @@
<PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.Linux" Version="6.1.4-build6" />
<PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.macOS" Version="5.0.3-build14" />
<PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.Windows" Version="6.1.4-build6" />
<PackageVersion Include="Ryujinx.Graphics.Vulkan.KosmicKrisp" Version="26.2.1-ryu.1" />
<PackageVersion Include="Ryujinx.Graphics.Vulkan.MoltenVK" Version="1.4.3-ryujinx.1" />
<PackageVersion Include="Ryujinx.Graphics.Vulkan.MoltenVK" Version="1.4.2-ryujinx.6" />
<PackageVersion Include="Ryujinx.LibHac" Version="0.21.0-alpha.133" />
<PackageVersion Include="Ryujinx.SPB" Version="0.0.5-ryujinx.4" />
<PackageVersion Include="Ryujinx.SDL3-CS" Version="2026.707.0" />
<PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
<PackageVersion Include="SharpZipLib" Version="1.4.2" />
@@ -49,7 +47,8 @@
<PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.23.0" />
<PackageVersion Include="SkiaSharp" Version="3.119.4" />
<PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="3.119.4" />
<PackageVersion Include="System.IO.Hashing" Version="10.0.12" />
<PackageVersion Include="SPB" Version="0.0.4-build32" />
<PackageVersion Include="System.IO.Hashing" Version="10.0.10" />
<PackageVersion Include="UnicornEngine.Unicorn" Version="2.1.0" />
</ItemGroup>
</Project>
</Project>
Ryujinx.slnx
-1
View File
@@ -21,7 +21,6 @@
<Project Path="src/Ryujinx.Graphics.Nvdec.Vp9/Ryujinx.Graphics.Nvdec.Vp9.csproj" />
<Project Path="src/Ryujinx.Graphics.Nvdec/Ryujinx.Graphics.Nvdec.csproj" />
<Project Path="src/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj" />
<Project Path="src/Ryujinx.Graphics.RenderDocApi/Ryujinx.Graphics.RenderDocApi.csproj" />
<Project Path="src/Ryujinx.Graphics.Shader/Ryujinx.Graphics.Shader.csproj" />
<Project Path="src/Ryujinx.Graphics.Texture/Ryujinx.Graphics.Texture.csproj" />
<Project Path="src/Ryujinx.Graphics.Vic/Ryujinx.Graphics.Vic.csproj" />
distribution/macos/construct_universal_dylib.py
+1 -1
View File
@@ -48,7 +48,7 @@ def get_new_name(
return Path(os.path.join(output_directory, input_component))
def get_archs(dylib_path: Path) -> list[str]:
res = subprocess.check_output([LIPO, "-info", str(dylib_path.absolute())]).decode("utf-8")
res = subprocess.check_output([LIPO, "-info", str(dylib_path)]).decode("utf-8")
if res.startswith("Non-fat file"):
return [res.split(":")[-1].strip()]
else:
distribution/macos/create_app_bundle.sh
+1 -5
View File
@@ -18,18 +18,14 @@ mkdir "$APP_BUNDLE_DIRECTORY/Contents/Resources"
cp "$PUBLISH_DIRECTORY/Ryujinx" "$APP_BUNDLE_DIRECTORY/Contents/MacOS/Ryujinx"
chmod u+x "$APP_BUNDLE_DIRECTORY/Contents/MacOS/Ryujinx"
# List all dylibs in PUBLISH_DIRECTORY
ls -la "$PUBLISH_DIRECTORY"/*.dylib
# Then all libraries
find "$PUBLISH_DIRECTORY" -name "*.dylib" -exec cp {} "$APP_BUNDLE_DIRECTORY/Contents/Frameworks" \;
cp "$PUBLISH_DIRECTORY"/*.dylib "$APP_BUNDLE_DIRECTORY/Contents/Frameworks"
# Then resources
cp Info.plist "$APP_BUNDLE_DIRECTORY/Contents"
cp Ryujinx.icns "$APP_BUNDLE_DIRECTORY/Contents/Resources/Ryujinx.icns"
cp updater.sh "$APP_BUNDLE_DIRECTORY/Contents/Resources/updater.sh"
cp Assets.car "$APP_BUNDLE_DIRECTORY/Contents/Resources/Assets.car"
cp -r vulkan "$APP_BUNDLE_DIRECTORY/Contents/Resources"
cp -r "$PUBLISH_DIRECTORY/THIRDPARTY.md" "$APP_BUNDLE_DIRECTORY/Contents/Resources"
echo -n "APPL????" > "$APP_BUNDLE_DIRECTORY/Contents/PkgInfo"
distribution/macos/create_macos_build_ava.sh
+1 -4
View File
@@ -47,7 +47,7 @@ EXECUTABLE_SUB_PATH=Contents/MacOS/Ryujinx
rm -rf "$TEMP_DIRECTORY"
mkdir -p "$TEMP_DIRECTORY"
DOTNET_COMMON_ARGS=(-p:DebugType=embedded -p:Version="$VERSION" -p:SourceRevisionId="$SOURCE_REVISION_ID" -p:UseSharedCompilation=false --self-contained true $EXTRA_ARGS)
DOTNET_COMMON_ARGS=(-p:DebugType=embedded -p:Version="$VERSION" -p:SourceRevisionId="$SOURCE_REVISION_ID" --self-contained true $EXTRA_ARGS)
dotnet restore
dotnet build -c "$CONFIGURATION" src/Ryujinx
@@ -76,9 +76,6 @@ rm "$UNIVERSAL_APP_BUNDLE/$EXECUTABLE_SUB_PATH"
# Make it libraries universal
python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_APP_BUNDLE" "$X64_APP_BUNDLE" "$UNIVERSAL_APP_BUNDLE" "**/*.dylib"
# Copy arm64-only libraries to UNIVERSAL_APP_BUNDLE
cp "$ARM64_APP_BUNDLE/Contents/Frameworks/libvulkan_kosmickrisp.dylib" "$UNIVERSAL_APP_BUNDLE/Contents/Frameworks/libvulkan_kosmickrisp.dylib"
if ! [ -x "$(command -v lipo)" ];
then
if ! [ -x "$(command -v llvm-lipo-17)" ];
distribution/macos/vulkan/icd.d/MoltenVK_icd-flat.json
-8
View File
@@ -1,8 +0,0 @@
{
"file_format_version" : "1.0.0",
"ICD": {
"library_path": "./libMoltenVK.dylib",
"api_version" : "1.4.0",
"is_portability_driver" : true
}
}
distribution/macos/vulkan/icd.d/MoltenVK_icd.json
-8
View File
@@ -1,8 +0,0 @@
{
"file_format_version" : "1.0.0",
"ICD": {
"library_path": "../../../Frameworks/libMoltenVK.dylib",
"api_version" : "1.4.0",
"is_portability_driver" : true
}
}
distribution/macos/vulkan/icd.d/libkosmickrisp_icd-flat.json
-7
View File
@@ -1,7 +0,0 @@
{
"ICD": {
"api_version": "1.3.0",
"library_path": "./libvulkan_kosmickrisp.dylib"
},
"file_format_version": "1.0.1"
}
distribution/macos/vulkan/icd.d/libkosmickrisp_icd.json
-7
View File
@@ -1,7 +0,0 @@
{
"ICD": {
"api_version": "1.3.0",
"library_path": "../../../Frameworks/libvulkan_kosmickrisp.dylib"
},
"file_format_version": "1.0.1"
}
nuget.config
-4
View File
@@ -2,7 +2,6 @@
<configuration>
<packageSources>
<clear />
<add key="local" value="nuget" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<!-- Only needed when using pre-release versions of Ryujinx.LibHac. -->
<add key="LibHacAlpha" value="https://git.ryujinx.app/api/packages/projects/nuget/index.json" />
@@ -11,9 +10,6 @@
<packageSourceMapping>
<!-- key value for <packageSource> should match key values from <packageSources> element -->
<!-- These are defined and .NET still yells about multiple package sources with no mappings. Not sure what to do, this is in the docs lol -->
<packageSource key="local">
<package pattern="Ryujinx.Graphics.Vulkan.KosmicKrisp" />
</packageSource>
<packageSource key="nuget.org">
<package pattern="*" />
</packageSource>
nuget/Ryujinx.Graphics.Vulkan.KosmicKrisp.26.2.1-ryu.1.nupkg
BIN
View File
Binary file not shown.
src/ARMeilleure/Translation/PTC/Ptc.cs
+21 -29
View File
@@ -32,11 +32,14 @@ namespace ARMeilleure.Translation.PTC
private const string OuterHeaderMagicString = "PTCohd\0\0";
private const string InnerHeaderMagicString = "PTCihd\0\0";
private const uint InternalVersion = 7031; //! To be incremented manually for each change to the ARMeilleure project.
private const uint InternalVersion = 7020; //! To be incremented manually for each change to the ARMeilleure project.
private const string ActualDir = "0";
private const string BackupDir = "1";
private const string TitleIdTextDefault = "0000000000000000";
private const string DisplayVersionDefault = "0";
public static readonly Symbol PageTableSymbol = new(SymbolType.Special, 1);
public static readonly Symbol CountTableSymbol = new(SymbolType.Special, 2);
public static readonly Symbol DispatchStubSymbol = new(SymbolType.Special, 3);
@@ -64,7 +67,8 @@ namespace ARMeilleure.Translation.PTC
private bool _disposed;
public PtcCacheInfo CacheInfo { get; private set; }
public string TitleIdText { get; private set; }
public string DisplayVersion { get; private set; }
private MemoryManagerType _memoryMode;
@@ -93,7 +97,8 @@ namespace ARMeilleure.Translation.PTC
_disposed = false;
CacheInfo = new PtcCacheInfo(0, null, null, 0, null, "Unknown", "default");
TitleIdText = TitleIdTextDefault;
DisplayVersion = DisplayVersionDefault;
CachePathActual = string.Empty;
CachePathBackup = string.Empty;
@@ -101,24 +106,20 @@ namespace ARMeilleure.Translation.PTC
Disable();
}
public void Initialize(PtcCacheInfo cacheInfo, bool enabled, MemoryManagerType memoryMode)
public void Initialize(string titleIdText, string displayVersion, bool enabled, MemoryManagerType memoryMode, string cacheSelector)
{
Wait();
Profiler.Wait();
Profiler.ClearEntries();
CacheInfo = cacheInfo;
Logger.Info?.Print(LogClass.Ptc, $"Initializing Profiled Persistent Translation Cache v{InternalVersion}\n\t\t (title: {titleIdText}, version: '{displayVersion}', selector: '{cacheSelector}', enabled: {enabled}).");
Logger.Info?.Print(
LogClass.Ptc,
$"Initializing Profiled Persistent Translation Cache v{InternalVersion}\n\t\t " +
$"(pid: {cacheInfo.ProcessId}, title: {cacheInfo.TitleIdText}, application: {cacheInfo.ApplicationIdText}, " +
$"programIndex: {cacheInfo.ProgramIndex}, version: '{cacheInfo.DisplayVersion}', kind: {cacheInfo.ProcessKind}, " +
$"selector: '{cacheInfo.CacheSelector}', key: '{cacheInfo.CacheKey}', enabled: {enabled}).");
if (!enabled || cacheInfo.TitleIdText == PtcCacheInfo.TitleIdTextDefault)
if (!enabled || string.IsNullOrEmpty(titleIdText) || titleIdText == TitleIdTextDefault)
{
TitleIdText = TitleIdTextDefault;
DisplayVersion = DisplayVersionDefault;
CachePathActual = string.Empty;
CachePathBackup = string.Empty;
@@ -127,10 +128,12 @@ namespace ARMeilleure.Translation.PTC
return;
}
TitleIdText = titleIdText;
DisplayVersion = !string.IsNullOrEmpty(displayVersion) ? displayVersion : DisplayVersionDefault;
_memoryMode = memoryMode;
string workPathActual = Path.Combine(AppDataManager.GamesDirPath, CacheInfo.TitleIdText, "cache", "cpu", ActualDir);
string workPathBackup = Path.Combine(AppDataManager.GamesDirPath, CacheInfo.TitleIdText, "cache", "cpu", BackupDir);
string workPathActual = Path.Combine(AppDataManager.GamesDirPath, TitleIdText, "cache", "cpu", ActualDir);
string workPathBackup = Path.Combine(AppDataManager.GamesDirPath, TitleIdText, "cache", "cpu", BackupDir);
if (!Directory.Exists(workPathActual))
{
@@ -142,14 +145,8 @@ namespace ARMeilleure.Translation.PTC
Directory.CreateDirectory(workPathBackup);
}
CachePathActual = Path.Combine(workPathActual, CacheInfo.DisplayVersion) + "-" + CacheInfo.CacheSelector;
CachePathBackup = Path.Combine(workPathBackup, CacheInfo.DisplayVersion) + "-" + CacheInfo.CacheSelector;
Logger.Info?.Print(
LogClass.Ptc,
$"PPTC cache owner selected (pid: {CacheInfo.ProcessId}, title: {CacheInfo.TitleIdText}, application: {CacheInfo.ApplicationIdText}, " +
$"version: '{CacheInfo.DisplayVersion}', kind: {CacheInfo.ProcessKind}, selector: '{CacheInfo.CacheSelector}', " +
$"key: '{CacheInfo.CacheKey}', path: '{CachePathActual}').");
CachePathActual = Path.Combine(workPathActual, DisplayVersion) + "-" + cacheSelector;
CachePathBackup = Path.Combine(workPathBackup, DisplayVersion) + "-" + cacheSelector;
PreLoad();
Profiler.PreLoad();
@@ -373,12 +370,7 @@ namespace ARMeilleure.Translation.PTC
long fileSize = new FileInfo(fileName).Length;
Logger.Info?.Print(
LogClass.Ptc,
$"{(isBackup ? "Loaded Backup Translation Cache" : "Loaded Translation Cache")} " +
$"(pid: {CacheInfo.ProcessId}, title: {CacheInfo.TitleIdText}, version: '{CacheInfo.DisplayVersion}', kind: {CacheInfo.ProcessKind}, " +
$"selector: '{CacheInfo.CacheSelector}', key: '{CacheInfo.CacheKey}', path: '{fileName}', " +
$"size: {fileSize} bytes, translated functions: {GetEntriesCount()}).");
Logger.Info?.Print(LogClass.Ptc, $"{(isBackup ? "Loaded Backup Translation Cache" : "Loaded Translation Cache")} (size: {fileSize} bytes, translated functions: {GetEntriesCount()}).");
return true;
}
src/ARMeilleure/Translation/PTC/PtcCacheInfo.cs
-37
View File
@@ -1,37 +0,0 @@
namespace ARMeilleure.Translation.PTC
{
public readonly struct PtcCacheInfo
{
public const string TitleIdTextDefault = "0000000000000000";
public const string ApplicationIdTextDefault = "0000000000000000";
public const string DisplayVersionDefault = "0";
public ulong ProcessId { get; }
public string TitleIdText { get; }
public string ApplicationIdText { get; }
public byte ProgramIndex { get; }
public string DisplayVersion { get; }
public string ProcessKind { get; }
public string CacheSelector { get; }
public string CacheKey => $"{DisplayVersion}-{CacheSelector}";
public PtcCacheInfo(
ulong processId,
string titleIdText,
string applicationIdText,
byte programIndex,
string displayVersion,
string processKind,
string cacheSelector)
{
ProcessId = processId;
TitleIdText = !string.IsNullOrEmpty(titleIdText) ? titleIdText : TitleIdTextDefault;
ApplicationIdText = !string.IsNullOrEmpty(applicationIdText) ? applicationIdText : ApplicationIdTextDefault;
ProgramIndex = programIndex;
DisplayVersion = !string.IsNullOrEmpty(displayVersion) ? displayVersion : DisplayVersionDefault;
ProcessKind = processKind ?? string.Empty;
CacheSelector = string.IsNullOrEmpty(cacheSelector) ? "default" : cacheSelector;
}
}
}
src/ARMeilleure/Translation/PTC/PtcProfiler.cs
+3 -12
View File
@@ -23,7 +23,7 @@ namespace ARMeilleure.Translation.PTC
{
private const string OuterHeaderMagicString = "Pohd\0\0\0\0";
private const uint InternalVersion = 7031; //! Not to be incremented manually for each change to the ARMeilleure project.
private const uint InternalVersion = 6698; //! Not to be incremented manually for each change to the ARMeilleure project.
private static readonly uint[] _migrateInternalVersions =
[
@@ -254,12 +254,7 @@ namespace ARMeilleure.Translation.PTC
long fileSize = new FileInfo(fileName).Length;
Logger.Info?.Print(
LogClass.Ptc,
$"{(isBackup ? "Loaded Backup Profiling Info" : "Loaded Profiling Info")} " +
$"(pid: {_ptc.CacheInfo.ProcessId}, title: {_ptc.CacheInfo.TitleIdText}, version: '{_ptc.CacheInfo.DisplayVersion}', " +
$"kind: {_ptc.CacheInfo.ProcessKind}, selector: '{_ptc.CacheInfo.CacheSelector}', key: '{_ptc.CacheInfo.CacheKey}', " +
$"path: '{fileName}', size: {fileSize} bytes, profiled functions: {ProfiledFuncs.Count}).");
Logger.Info?.Print(LogClass.Ptc, $"{(isBackup ? "Loaded Backup Profiling Info" : "Loaded Profiling Info")} (size: {fileSize} bytes, profiled functions: {ProfiledFuncs.Count}).");
return true;
}
@@ -380,11 +375,7 @@ namespace ARMeilleure.Translation.PTC
if (fileSize != 0L)
{
Logger.Info?.Print(
LogClass.Ptc,
$"Saved Profiling Info (pid: {_ptc.CacheInfo.ProcessId}, title: {_ptc.CacheInfo.TitleIdText}, version: '{_ptc.CacheInfo.DisplayVersion}', " +
$"kind: {_ptc.CacheInfo.ProcessKind}, selector: '{_ptc.CacheInfo.CacheSelector}', key: '{_ptc.CacheInfo.CacheKey}', " +
$"path: '{fileName}', size: {fileSize} bytes, profiled functions: {profiledFuncsCount}).");
Logger.Info?.Print(LogClass.Ptc, $"Saved Profiling Info (size: {fileSize} bytes, profiled functions: {profiledFuncsCount}).");
}
}
src/ARMeilleure/Translation/Translator.cs
+6 -2
View File
@@ -61,9 +61,9 @@ namespace ARMeilleure.Translation
FunctionTable.Fill = (ulong)Stubs.SlowDispatchStub;
}
public IPtcLoadState LoadDiskCache(PtcCacheInfo cacheInfo, bool enabled)
public IPtcLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled, string cacheSelector)
{
_ptc.Initialize(cacheInfo, enabled, Memory.Type);
_ptc.Initialize(titleIdText, displayVersion, enabled, Memory.Type, cacheSelector);
return _ptc;
}
@@ -413,6 +413,10 @@ namespace ARMeilleure.Translation
context.CurrOp = opCode;
Operand nativeContext = context.LoadArgument(OperandType.I64, 0);
Operand dispAddressAddr = context.Add(nativeContext, Const((ulong)NativeContext.GetDispatchAddressOffset()));
context.Store(dispAddressAddr, Const(opCode.Address));
bool isLastOp = opcIndex == block.OpCodes.Count - 1;
if (isLastOp)
src/Ryujinx.Common/Configuration/Hid/Controller/RumbleConfigController.cs
-5
View File
@@ -16,10 +16,5 @@ namespace Ryujinx.Common.Configuration.Hid.Controller
/// Enable Rumble
/// </summary>
public bool EnableRumble { get; set; }
/// <summary>
/// Enable HD Rumble support
/// </summary
public bool UseHDRumble { get; set; }
}
}
src/Ryujinx.Common/Configuration/TranslationLayer.cs
-11
View File
@@ -1,11 +0,0 @@
using System.Text.Json.Serialization;
namespace Ryujinx.Common.Configuration
{
[JsonConverter(typeof(JsonStringEnumConverter<TranslationLayer>))]
public enum TranslationLayer
{
MoltenVK,
KosmicKrisp,
}
}
src/Ryujinx.Common/Utilities/EmbeddedResources.cs
+2 -7
View File
@@ -126,13 +126,8 @@ namespace Ryujinx.Common
public static string[] GetAllAvailableResources(string path, string ext = "")
{
(Assembly assembly, string resourcePath) = ResolveManifestPath(path);
string manifestPath = assembly.GetName().Name + "." + resourcePath.Replace('/', '.');
return assembly.GetManifestResourceNames()
.Where(r => r.StartsWith(manifestPath + ".", StringComparison.Ordinal))
.Where(r => r.EndsWith(ext, StringComparison.Ordinal))
return ResolveManifestPath(path).Item1.GetManifestResourceNames()
.Where(r => r.EndsWith(ext))
.ToArray();
}
src/Ryujinx.Cpu/AppleHv/HvCpuContext.cs
+1 -2
View File
@@ -1,5 +1,4 @@
using ARMeilleure.Memory;
using ARMeilleure.Translation.PTC;
using System.Runtime.Versioning;
namespace Ryujinx.Cpu.AppleHv
@@ -33,7 +32,7 @@ namespace Ryujinx.Cpu.AppleHv
{
}
public IDiskCacheLoadState LoadDiskCache(PtcCacheInfo cacheInfo, bool enabled)
public IDiskCacheLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled, string cacheSelector)
{
return new DummyDiskCacheLoadState();
}
src/Ryujinx.Cpu/ICpuContext.cs
+3 -3
View File
@@ -1,5 +1,4 @@
using System;
using ARMeilleure.Translation.PTC;
namespace Ryujinx.Cpu
{
@@ -45,10 +44,11 @@ namespace Ryujinx.Cpu
/// <remarks>
/// If the execution engine is recompiling guest code, this can be used to load cached code from disk.
/// </remarks>
/// <param name="cacheInfo">Identity and selector for the process-owned disk cache</param>
/// <param name="titleIdText">Title ID of the application in padded hex form</param>
/// <param name="displayVersion">Version of the application</param>
/// <param name="enabled">True if the cache should be loaded from disk if it exists, false otherwise</param>
/// <returns>Disk cache load progress reporter and manager</returns>
IDiskCacheLoadState LoadDiskCache(PtcCacheInfo cacheInfo, bool enabled);
IDiskCacheLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled, string cacheSelector);
/// <summary>
/// Indicates that code has been loaded into guest memory, and that it might be executed in the future.
src/Ryujinx.Cpu/Jit/JitCpuContext.cs
+2 -3
View File
@@ -1,7 +1,6 @@
using ARMeilleure.Common;
using ARMeilleure.Memory;
using ARMeilleure.Translation;
using ARMeilleure.Translation.PTC;
using Ryujinx.Cpu.Signal;
namespace Ryujinx.Cpu.Jit
@@ -52,9 +51,9 @@ namespace Ryujinx.Cpu.Jit
}
/// <inheritdoc/>
public IDiskCacheLoadState LoadDiskCache(PtcCacheInfo cacheInfo, bool enabled)
public IDiskCacheLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled, string cacheSelector)
{
return new JitDiskCacheLoadState(_translator.LoadDiskCache(cacheInfo, enabled));
return new JitDiskCacheLoadState(_translator.LoadDiskCache(titleIdText, displayVersion, enabled, cacheSelector));
}
/// <inheritdoc/>
src/Ryujinx.Cpu/LightningJit/Arm32/Decoder.cs
+2 -2
View File
@@ -8,7 +8,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm32
{
static class Decoder<T> where T : IInstEmit
{
public static MultiBlock DecodeMulti(CpuPreset cpuPreset, IMemoryManager memoryManager, ulong address, bool isThumb)
public static MultiBlock DecodeMulti(CpuPreset cpuPreset, IMemoryManager memoryManager, ulong address, bool singleBlock, bool isThumb)
{
List<Block> blocks = [];
List<ulong> branchTargets = [];
@@ -24,7 +24,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm32
blocks.Add(block);
if (block.IsTruncated || !HasNextBlock(block, block.EndAddress - 4UL, branchTargets))
if (block.IsTruncated || (singleBlock && block.EndsWithBranch) || !HasNextBlock(block, block.EndAddress - 4UL, branchTargets))
{
break;
}
src/Ryujinx.Cpu/LightningJit/Arm32/Target/Arm64/Compiler.cs
+1 -1
View File
@@ -227,7 +227,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm32.Target.Arm64
public static CompiledFunction Compile(CpuPreset cpuPreset, IMemoryManager memoryManager, ulong address, IAddressTable<ulong> funcTable, nint dispatchStubPtr, bool isThumb)
{
MultiBlock multiBlock = Decoder<InstEmit>.DecodeMulti(cpuPreset, memoryManager, address, isThumb);
MultiBlock multiBlock = Decoder<InstEmit>.DecodeMulti(cpuPreset, memoryManager, address, singleBlock: true, isThumb);
Dictionary<ulong, int> targets = new();
src/Ryujinx.Cpu/LightningJit/Arm64/Target/Arm64/Compiler.cs
+1 -1
View File
@@ -305,7 +305,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm64.Target.Arm64
public static CompiledFunction Compile(CpuPreset cpuPreset, IMemoryManager memoryManager, ulong address, IAddressTable<ulong> funcTable, nint dispatchStubPtr)
{
MultiBlock multiBlock = Decoder.DecodeMulti(cpuPreset, memoryManager, address);
MultiBlock multiBlock = Decoder.DecodeMulti(cpuPreset, memoryManager, address, singleBlock: true);
Dictionary<ulong, int> targets = new();
List<PendingBranch> pendingBranches = [];
src/Ryujinx.Cpu/LightningJit/Arm64/Target/Arm64/Decoder.cs
+2 -2
View File
@@ -13,7 +13,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm64.Target.Arm64
private const uint NzcvFlags = 0xfu << 28;
private const uint CFlag = 0x1u << 29;
public static MultiBlock DecodeMulti(CpuPreset cpuPreset, IMemoryManager memoryManager, ulong address)
public static MultiBlock DecodeMulti(CpuPreset cpuPreset, IMemoryManager memoryManager, ulong address, bool singleBlock)
{
List<Block> blocks = [];
List<ulong> branchTargets = [];
@@ -35,7 +35,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm64.Target.Arm64
blocks.Add(block);
if (block.IsTruncated || !HasNextBlock(block, block.EndAddress - 4UL, branchTargets))
if (block.IsTruncated || (singleBlock && block.EndsWithBranch) || !HasNextBlock(block, block.EndAddress - 4UL, branchTargets))
{
break;
}
src/Ryujinx.Cpu/LightningJit/LightningJitCpuContext.cs
+1 -2
View File
@@ -1,6 +1,5 @@
using ARMeilleure.Common;
using ARMeilleure.Memory;
using ARMeilleure.Translation.PTC;
using Ryujinx.Cpu.Jit;
using Ryujinx.Cpu.LightningJit.State;
@@ -47,7 +46,7 @@ namespace Ryujinx.Cpu.LightningJit
}
/// <inheritdoc/>
public IDiskCacheLoadState LoadDiskCache(PtcCacheInfo cacheInfo, bool enabled)
public IDiskCacheLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled, string cacheSelector)
{
return new DummyDiskCacheLoadState();
}
src/Ryujinx.Graphics.GAL/Capabilities.cs
+6
View File
@@ -32,6 +32,7 @@ namespace Ryujinx.Graphics.GAL
public readonly bool SupportsGeometryShader;
public readonly bool SupportsGeometryShaderPassthrough;
public readonly bool SupportsTransformFeedback;
public readonly bool SupportsImageBufferPixelAlignment;
public readonly bool SupportsImageLoadFormatted;
public readonly bool SupportsLayerVertexTessellation;
public readonly bool SupportsMismatchingViewFormat;
@@ -43,6 +44,7 @@ namespace Ryujinx.Graphics.GAL
public readonly bool SupportsShaderBarrierDivergence;
public readonly bool SupportsShaderFloat64;
public readonly bool SupportsShaderNonUniformIndexing;
public readonly bool SupportsTextureBufferPixelAlignment;
public readonly bool SupportsTextureGatherOffsets;
public readonly bool SupportsTextureShadowLod;
public readonly bool SupportsVertexStoreAndAtomics;
@@ -101,6 +103,7 @@ namespace Ryujinx.Graphics.GAL
bool supportsGeometryShader,
bool supportsGeometryShaderPassthrough,
bool supportsTransformFeedback,
bool supportsImageBufferPixelAlignment,
bool supportsImageLoadFormatted,
bool supportsLayerVertexTessellation,
bool supportsMismatchingViewFormat,
@@ -112,6 +115,7 @@ namespace Ryujinx.Graphics.GAL
bool supportsShaderBarrierDivergence,
bool supportsShaderFloat64,
bool supportsShaderNonUniformIndexing,
bool supportsTextureBufferPixelAlignment,
bool supportsTextureGatherOffsets,
bool supportsTextureShadowLod,
bool supportsVertexStoreAndAtomics,
@@ -164,6 +168,7 @@ namespace Ryujinx.Graphics.GAL
SupportsGeometryShader = supportsGeometryShader;
SupportsGeometryShaderPassthrough = supportsGeometryShaderPassthrough;
SupportsTransformFeedback = supportsTransformFeedback;
SupportsImageBufferPixelAlignment = supportsImageBufferPixelAlignment;
SupportsImageLoadFormatted = supportsImageLoadFormatted;
SupportsLayerVertexTessellation = supportsLayerVertexTessellation;
SupportsMismatchingViewFormat = supportsMismatchingViewFormat;
@@ -175,6 +180,7 @@ namespace Ryujinx.Graphics.GAL
SupportsShaderBarrierDivergence = supportsShaderBarrierDivergence;
SupportsShaderFloat64 = supportsShaderFloat64;
SupportsShaderNonUniformIndexing = supportsShaderNonUniformIndexing;
SupportsTextureBufferPixelAlignment = supportsTextureBufferPixelAlignment;
SupportsTextureGatherOffsets = supportsTextureGatherOffsets;
SupportsTextureShadowLod = supportsTextureShadowLod;
SupportsVertexStoreAndAtomics = supportsVertexStoreAndAtomics;
src/Ryujinx.Graphics.GAL/Target.cs
+11 -10
View File
@@ -16,18 +16,19 @@ namespace Ryujinx.Graphics.GAL
public static class TargetExtensions
{
extension(Target target)
public static bool IsMultisample(this Target target)
{
public bool IsMultisample => target is Target.Texture2DMultisample or Target.Texture2DMultisampleArray;
return target is Target.Texture2DMultisample or Target.Texture2DMultisampleArray;
}
public bool HasDepthOrLayers =>
target is
Target.Texture3D or
Target.Texture1DArray or
Target.Texture2DArray or
Target.Texture2DMultisampleArray or
Target.Cubemap or
Target.CubemapArray;
public static bool HasDepthOrLayers(this Target target)
{
return target is Target.Texture3D
or Target.Texture1DArray
or Target.Texture2DArray
or Target.Texture2DMultisampleArray
or Target.Cubemap
or Target.CubemapArray;
}
}
}
src/Ryujinx.Graphics.Gpu/Engine/Threed/DrawManager.cs
+2 -1
View File
@@ -466,6 +466,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
engine.UpdateState(ulong.MaxValue & ~(1UL << StateUpdater.ShaderStateIndex));
_channel.TextureManager.SignalRenderTargetsModifiable();
_channel.TextureManager.UpdateRenderTargets();
int textureId = _state.State.DrawTextureTextureId;
@@ -803,7 +804,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
int index = (argument >> 6) & 0xf;
int layer = (argument >> 10) & 0x3ff;
RenderTargetUpdateFlags updateFlags = RenderTargetUpdateFlags.SingleColor;
RenderTargetUpdateFlags updateFlags = RenderTargetUpdateFlags.SingleColor | RenderTargetUpdateFlags.ForClear;
if (layer != 0 || layerCount > 1)
{
src/Ryujinx.Graphics.Gpu/Engine/Threed/RenderTargetUpdateFlags.cs
+5
View File
@@ -38,6 +38,11 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
/// </summary>
DiscardClip = 1 << 4,
/// <summary>
/// Indicates that the render target will be used for a clear operation.
/// </summary>
ForClear = 1 << 5,
/// <summary>
/// Default update flags for draw.
/// </summary>
src/Ryujinx.Graphics.Gpu/Engine/Threed/StateUpdater.cs
+36 -10
View File
@@ -45,6 +45,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
private ProgramPipelineState _pipeline;
private bool _fsReadsFragCoord;
private bool _fsAlwaysDiscards;
private bool _vsUsesDrawParameters;
private bool _vtgWritesRtLayer;
private byte _vsClipDistancesWritten;
@@ -491,6 +492,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
Span<RtColorState> rtColorStateSpan = _state.State.RtColorState.AsSpan();
bool rtModifiable = updateFlags.HasFlag(RenderTargetUpdateFlags.ForClear) || !_fsAlwaysDiscards;
for (int index = 0; index < Constants.TotalRenderTargets; index++)
{
int rtIndex = useControl ? rtControl.UnpackPermutationIndex(index) : index;
@@ -499,7 +502,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
if (index >= count || !IsRtEnabled(colorState) || (singleColor && index != singleUse))
{
changedScale |= _channel.TextureManager.SetRenderTargetColor(index, null);
changedScale |= _channel.TextureManager.SetRenderTargetColor(index, null, rtModifiable);
continue;
}
@@ -518,7 +521,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
samplesInY,
sizeHint);
changedScale |= _channel.TextureManager.SetRenderTargetColor(index, color);
changedScale |= _channel.TextureManager.SetRenderTargetColor(index, color, rtModifiable);
if (color != null)
{
@@ -572,7 +575,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
}
}
changedScale |= _channel.TextureManager.SetRenderTargetDepthStencil(depthStencil);
changedScale |= _channel.TextureManager.SetRenderTargetDepthStencil(depthStencil, rtModifiable);
if (changedScale)
{
@@ -774,6 +777,11 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
float width = scaleX * 2;
float height = scaleY * 2;
if (yNegate)
{
y += _state.State.ScreenScissorState.Height - MathF.Abs(height);
}
float scale = _channel.TextureManager.RenderTargetScale;
if (scale != 1f)
{
@@ -1517,20 +1525,38 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
_currentProgramInfo[stageIndex] = info;
}
if (gs.Shaders[5]?.Info.UsesFragCoord == true)
{
// Make sure we update the viewport size on the support buffer if it will be consumed on the new shader.
_fsReadsFragCoord = false;
if (!_fsReadsFragCoord && (_state.State.YControl & YControl.NegateY) != 0)
ShaderProgramInfo fragmentShaderInfo = gs.Shaders[5]?.Info;
if (fragmentShaderInfo != null)
{
if (fragmentShaderInfo.UsesFragCoord)
{
UpdateSupportBufferViewportSize();
// Make sure we update the viewport size on the support buffer if it will be consumed on the new shader.
if (!_fsReadsFragCoord && (_state.State.YControl & YControl.NegateY) != 0)
{
UpdateSupportBufferViewportSize();
}
_fsReadsFragCoord = true;
}
_fsReadsFragCoord = true;
if (_fsAlwaysDiscards != fragmentShaderInfo.HasUnconditionalDiscard)
{
_fsAlwaysDiscards = fragmentShaderInfo.HasUnconditionalDiscard;
if (!_fsAlwaysDiscards)
{
_channel.TextureManager.RefreshModifiedTextures();
_channel.TextureManager.SignalRenderTargetsModifiable();
}
}
}
else
{
_fsReadsFragCoord = false;
_fsAlwaysDiscards = false;
}
if (gs.VertexAsCompute != null)
src/Ryujinx.Graphics.Gpu/Image/Texture.cs
+12 -8
View File
@@ -1117,7 +1117,7 @@ namespace Ryujinx.Graphics.Gpu.Image
/// <returns>True if data was flushed, false otherwise</returns>
public bool FlushModified(bool tracked = true)
{
return TextureCompatibility.CanTextureFlush(Info, _context.Capabilities) && Group.FlushModified(this, tracked);
return TextureCompatibility.CanTextureFlush(this, _context.Capabilities) && Group.FlushModified(this, tracked);
}
/// <summary>
@@ -1131,7 +1131,7 @@ namespace Ryujinx.Graphics.Gpu.Image
/// <param name="tracked">Whether or not the flush triggers write tracking. If it doesn't, the texture will not be blacklisted for scaling either.</param>
public void Flush(bool tracked)
{
if (TextureCompatibility.CanTextureFlush(Info, _context.Capabilities))
if (TextureCompatibility.CanTextureFlush(this, _context.Capabilities))
{
FlushTextureDataToGuest(tracked);
}
@@ -1336,7 +1336,7 @@ namespace Ryujinx.Graphics.Gpu.Image
{
result = TextureCompatibility.PropagateViewCompatibility(result, TextureCompatibility.ViewTargetCompatible(Info, info, ref caps));
bool bothMs = Info.Target.IsMultisample && info.Target.IsMultisample;
bool bothMs = Info.Target.IsMultisample() && info.Target.IsMultisample();
if (bothMs && (Info.SamplesInX != info.SamplesInX || Info.SamplesInY != info.SamplesInY))
{
result = TextureViewCompatibility.Incompatible;
@@ -1572,11 +1572,6 @@ namespace Ryujinx.Graphics.Gpu.Image
/// <param name="bound">True if the texture has been bound, false if it has been unbound</param>
public void SignalModifying(bool bound)
{
if (bound)
{
_scaledSetScore = Math.Max(0, _scaledSetScore - 1);
}
if (_modifiedStale || Group.HasCopyDependencies || Group.HasFlushBuffer)
{
_modifiedStale = false;
@@ -1584,9 +1579,18 @@ namespace Ryujinx.Graphics.Gpu.Image
}
_physicalMemory.TextureCache.Lift(this);
}
/// <summary>
/// Signals that a render target texture has been either bound or unbound.
/// </summary>
/// <param name="bound">True if the texture has been bound, false if it has been unbound</param>
public void SignalBindingChange(bool bound)
{
if (bound)
{
_scaledSetScore = Math.Max(0, _scaledSetScore - 1);
IncrementReferenceCount();
}
else
src/Ryujinx.Graphics.Gpu/Image/TextureBindingsManager.cs
+69 -2
View File
@@ -4,6 +4,7 @@ using Ryujinx.Graphics.Gpu.Engine.Types;
using Ryujinx.Graphics.Gpu.Memory;
using Ryujinx.Graphics.Gpu.Shader;
using Ryujinx.Graphics.Shader;
using Ryujinx.Memory.Range;
using System;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
@@ -67,6 +68,9 @@ namespace Ryujinx.Graphics.Gpu.Image
private int _lastFragmentTotal;
private readonly int _bufferTextureAlignment;
private readonly int _bufferImageAlignment;
/// <summary>
/// Constructs a new instance of the texture bindings manager.
/// </summary>
@@ -108,6 +112,10 @@ namespace Ryujinx.Graphics.Gpu.Image
}
_textureCounts = [];
int alignment = context.Capabilities.TextureBufferOffsetAlignment;
_bufferTextureAlignment = context.Capabilities.SupportsTextureBufferPixelAlignment ? 0 : alignment;
_bufferImageAlignment = context.Capabilities.SupportsImageBufferPixelAlignment ? 0 : alignment;
}
/// <summary>
@@ -521,10 +529,12 @@ namespace Ryujinx.Graphics.Gpu.Image
if (hostTexture != null && texture.Target == Target.TextureBuffer)
{
MultiRange range = GetAlignedBufferTextureRange(texture, index, stageIndex, false);
// Ensure that the buffer texture is using the correct buffer as storage.
// Buffers are frequently re-created to accommodate larger data, so we need to re-bind
// to ensure we're not using a old buffer that was already deleted.
_channel.BufferManager.SetBufferTextureStorage(stage, hostTexture, texture.Range, bindingInfo, false);
_channel.BufferManager.SetBufferTextureStorage(stage, hostTexture, range, bindingInfo, false);
// Cache is not used for buffer texture, it must always rebind.
state.CachedTexture = null;
@@ -659,7 +669,9 @@ namespace Ryujinx.Graphics.Gpu.Image
// Buffers are frequently re-created to accommodate larger data, so we need to re-bind
// to ensure we're not using a old buffer that was already deleted.
_channel.BufferManager.SetBufferTextureStorage(stage, hostTexture, texture.Range, bindingInfo, true);
MultiRange range = GetAlignedBufferTextureRange(texture, index, stageIndex, true);
_channel.BufferManager.SetBufferTextureStorage(stage, hostTexture, range, bindingInfo, true);
// Cache is not used for buffer texture, it must always rebind.
state.CachedTexture = null;
@@ -692,6 +704,61 @@ namespace Ryujinx.Graphics.Gpu.Image
return specStateMatches;
}
/// <summary>
/// Gets the aligned address of the texture according to the host requirements.
/// </summary>
/// <param name="texture">Texture to have its address aligned</param>
/// <param name="index">Index of the texture in the shader</param>
/// <param name="stageIndex">Index of the shader stage</param>
/// <param name="isImage">True if the texture is bound as image, false for sampled textures</param>
/// <returns>Aligned address and size of the buffer texture</returns>
private MultiRange GetAlignedBufferTextureRange(Texture texture, int index, int stageIndex, bool isImage)
{
MultiRange range = texture.Range;
int alignment = isImage ? _bufferImageAlignment : _bufferTextureAlignment;
if (alignment != 0)
{
MemoryRange firstRange = range.GetSubRange(0);
ulong misalign = firstRange.Address & ((ulong)alignment - 1);
int offset = misalign != 0 ? (int)misalign / texture.Info.FormatInfo.BytesPerPixel : 0;
if (misalign != 0)
{
firstRange = new MemoryRange(firstRange.Address - misalign, firstRange.Size + misalign);
if (range.Count > 1)
{
MemoryRange[] ranges = new MemoryRange[range.Count];
ranges[0] = firstRange;
for (int i = 1; i < range.Count; i++)
{
ranges[i] = range.GetSubRange(i);
}
range = new MultiRange(ranges);
}
else
{
range = new MultiRange(firstRange.Address, firstRange.Size);
}
}
if (isImage)
{
_context.SupportBufferUpdater.UpdateBufferImageOffset(stageIndex, index, offset);
}
else
{
_context.SupportBufferUpdater.UpdateBufferTextureOffset(stageIndex, index, offset);
}
}
return range;
}
/// <summary>
/// Gets the texture descriptor for a given texture handle.
/// </summary>
src/Ryujinx.Graphics.Gpu/Image/TextureCompatibility.cs
+17 -11
View File
@@ -195,6 +195,16 @@ namespace Ryujinx.Graphics.Gpu.Image
return true;
}
/// <summary>
/// Determines whether a texture can flush its data back to guest memory.
/// </summary>
/// <param name="info">Texture that will have its data flushed</param>
/// <param name="caps">Host GPU Capabilities</param>
/// <returns>True if the texture can flush, false otherwise</returns>
public static bool CanTextureFlush(Texture texture, in Capabilities caps)
{
return !texture.HasImportOverride() && CanTextureFlush(texture.Info, caps);
}
/// <summary>
/// Determines whether a texture can flush its data back to guest memory.
@@ -202,15 +212,14 @@ namespace Ryujinx.Graphics.Gpu.Image
/// <param name="info">Texture information</param>
/// <param name="caps">Host GPU Capabilities</param>
/// <returns>True if the texture can flush, false otherwise</returns>
public static bool CanTextureFlush(TextureInfo info, Capabilities caps)
private static bool CanTextureFlush(TextureInfo info, in Capabilities caps)
{
if (IsFormatHostIncompatible(info, caps))
if (IsFormatHostIncompatible(info, in caps))
{
return false; // Flushing this format is not supported, as it may have been converted to another host format.
}
if (info.Target is Target.Texture2DMultisample or
Target.Texture2DMultisampleArray)
if (info.Target is Target.Texture2DMultisample or Target.Texture2DMultisampleArray)
{
return false; // Flushing multisample textures is not supported, the host does not allow getting their data.
}
@@ -372,15 +381,12 @@ namespace Ryujinx.Graphics.Gpu.Image
}
// Some APIs align the width for copy and render target textures,
// so the width may not match for different uses of the same texture.
// so the width may not match in this case for different uses of the same texture.
// To account for this, we compare the aligned width here.
// However, matching block footprints are not sufficient for compressed textures;
// their logical dimensions must also match.
// We expect height to always match exactly, if the texture is the same.
if (alignedWidthMatches && lhsSize.Height == rhsSize.Height)
{
return ((lhs.FormatInfo.IsCompressed || rhs.FormatInfo.IsCompressed) &&
(Math.Max(1, lhs.Width >> level) != rhs.Width || Math.Max(1, lhs.Height >> level) != rhs.Height)) ||
(exact && lhsSize.Width != rhsSize.Width) || lhsSize.Width < rhsSize.Width
return (exact && lhsSize.Width != rhsSize.Width) || lhsSize.Width < rhsSize.Width
? TextureViewCompatibility.CopyOnly
: result;
}
@@ -391,7 +397,7 @@ namespace Ryujinx.Graphics.Gpu.Image
return stride == rhs.Stride ? TextureViewCompatibility.CopyOnly : TextureViewCompatibility.LayoutIncompatible;
}
else if (lhs.Target.IsMultisample != rhs.Target.IsMultisample && alignedWidthMatches && lhsAlignedSize.Height == rhsAlignedSize.Height)
else if (lhs.Target.IsMultisample() != rhs.Target.IsMultisample() && alignedWidthMatches && lhsAlignedSize.Height == rhsAlignedSize.Height)
{
// Copy between multisample and non-multisample textures with mismatching size is allowed,
// as long aligned size matches.
src/Ryujinx.Graphics.Gpu/Image/TextureGroup.cs
+20 -32
View File
@@ -147,7 +147,7 @@ namespace Ryujinx.Graphics.Gpu.Image
_allOffsets = size.AllOffsets;
_sliceSizes = size.SliceSizes;
if (Storage.Target.HasDepthOrLayers && Storage.Info.GetSlices() > GranularLayerThreshold)
if (Storage.Target.HasDepthOrLayers() && Storage.Info.GetSlices() > GranularLayerThreshold)
{
_hasLayerViews = true;
_hasMipViews = true;
@@ -182,11 +182,7 @@ namespace Ryujinx.Graphics.Gpu.Image
{
foreach (TextureIncompatibleOverlap overlap in _incompatibleOverlaps)
{
// LayoutIncompatible and better may still use a regular texture copy dependency.
// Fully Incompatible pairs are not copy compatible in general, but may still qualify for an
// exact raw byte copy dependency (checked internally by CreateCopyDependency) when they map
// to exactly the same guest memory, such as differently typed/sized aliases of the same data.
if (overlap.Compatibility <= TextureViewCompatibility.Incompatible)
if (overlap.Compatibility <= TextureViewCompatibility.LayoutIncompatible)
{
CreateCopyDependency(overlap.Group, false, overlap.Compatibility);
}
@@ -230,6 +226,7 @@ namespace Ryujinx.Graphics.Gpu.Image
}
}
/// <summary>
/// Flushes incompatible overlaps if the storage format requires it, and they have been modified.
/// This allows unsupported host formats to accept data written to format aliased textures.
@@ -327,7 +324,7 @@ namespace Ryujinx.Graphics.Gpu.Image
{
FlushIncompatibleOverlapsIfNeeded();
EvaluateRelevantHandles(texture, (baseHandle, regionCount, split, bound) =>
EvaluateRelevantHandles(texture, (baseHandle, regionCount, split, _) =>
{
bool dirty = false;
bool anyModified = false;
@@ -482,7 +479,7 @@ namespace Ryujinx.Graphics.Gpu.Image
/// <param name="texture">The texture to synchronize dependents of</param>
public void SynchronizeDependents(Texture texture)
{
EvaluateRelevantHandles(texture, (baseHandle, regionCount, split, bound) =>
EvaluateRelevantHandles(texture, (baseHandle, regionCount, _, _) =>
{
for (int i = 0; i < regionCount; i++)
{
@@ -574,7 +571,7 @@ namespace Ryujinx.Graphics.Gpu.Image
tracked = tracked || ShouldFlushTriggerTracking();
bool flushed = false;
EvaluateRelevantHandles(texture, (baseHandle, regionCount, split, bound) =>
EvaluateRelevantHandles(texture, (baseHandle, regionCount, split, _) =>
{
int startSlice = 0;
int endSlice = 0;
@@ -655,14 +652,14 @@ namespace Ryujinx.Graphics.Gpu.Image
if (_flushBuffer == BufferHandle.Null)
{
if (!TextureCompatibility.CanTextureFlush(Storage.Info, _context.Capabilities))
if (!TextureCompatibility.CanTextureFlush(Storage, _context.Capabilities))
{
return;
}
bool canImport = Storage.Info.IsLinear && Storage.Info.Stride >= Storage.Info.Width * Storage.Info.FormatInfo.BytesPerPixel;
nint hostPointer = canImport ? _physicalMemory.GetHostPointer(Storage.Range) : 0;
IntPtr hostPointer = canImport ? _physicalMemory.GetHostPointer(Storage.Range) : 0;
if (hostPointer != 0 && _context.Renderer.PrepareHostMapping(hostPointer, Storage.Size))
{
@@ -719,7 +716,7 @@ namespace Ryujinx.Graphics.Gpu.Image
ClearIncompatibleOverlaps(texture);
EvaluateRelevantHandles(texture, (baseHandle, regionCount, split, bound) =>
EvaluateRelevantHandles(texture, (baseHandle, regionCount, _, _) =>
{
for (int i = 0; i < regionCount; i++)
{
@@ -1052,7 +1049,7 @@ namespace Ryujinx.Graphics.Gpu.Image
int endOffset = _allOffsets[viewEnd] + _sliceSizes[lastLevel];
int size = endOffset - offset;
List<RegionHandle> result = [];
List<RegionHandle> result = new();
for (int i = 0; i < TextureRange.Count; i++)
{
@@ -1166,6 +1163,7 @@ namespace Ryujinx.Graphics.Gpu.Image
SignalAllDirty();
}
/// <summary>
/// Removes a view from the group, removing it from all overlap lists.
/// </summary>
@@ -1387,7 +1385,7 @@ namespace Ryujinx.Graphics.Gpu.Image
if (_is3D)
{
List<TextureGroupHandle> handlesList = [];
List<TextureGroupHandle> handlesList = new();
for (int i = 0; i < levelHandles; i++)
{
@@ -1470,15 +1468,15 @@ namespace Ryujinx.Graphics.Gpu.Image
// Get the location of each texture within its storage, so we can find the handles to apply the dependency to.
// This can consist of multiple disjoint regions, for example if this is a mip slice of an array texture.
List<(int BaseHandle, int RegionCount)> targetRange = [];
List<(int BaseHandle, int RegionCount)> otherRange = [];
List<(int BaseHandle, int RegionCount)> targetRange = new();
List<(int BaseHandle, int RegionCount)> otherRange = new();
EvaluateRelevantHandles(firstLayer, firstLevel, other.Info.GetSlices(), other.Info.Levels, (baseHandle, regionCount, split, specialData) =>
EvaluateRelevantHandles(firstLayer, firstLevel, other.Info.GetSlices(), other.Info.Levels, (baseHandle, regionCount, _, _) =>
{
targetRange.Add((baseHandle, regionCount));
return true;
}, out _);
otherGroup.EvaluateRelevantHandles(other, (baseHandle, regionCount, split, specialData) =>
otherGroup.EvaluateRelevantHandles(other, (baseHandle, regionCount, _, _) =>
{
otherRange.Add((baseHandle, regionCount));
return true;
@@ -1603,15 +1601,7 @@ namespace Ryujinx.Graphics.Gpu.Image
TextureInfo info = Storage.Info;
TextureInfo otherInfo = other.Storage.Info;
// ViewLayoutCompatible/CopySizeMatches only reason about textures with some genuine
// format relationship (LayoutIncompatible or better) - they are not aware of, and must
// never be used to justify, a plain texture-to-texture copy (which some backends
// implement via a reinterpreting view) between fully Incompatible aliases such as a
// depth format and an unrelated color format. For Incompatible pairs, only the strict
// raw byte copy dependency below (which explicitly excludes depth/stencil formats) may
// be used.
bool textureCopy = compatibility != TextureViewCompatibility.Incompatible &&
TextureCompatibility.ViewLayoutCompatible(info, otherInfo, level, otherLevel) &&
bool textureCopy = TextureCompatibility.ViewLayoutCompatible(info, otherInfo, level, otherLevel) &&
TextureCompatibility.CopySizeMatches(info, otherInfo, level, otherLevel);
if (textureCopy || rawCopy)
@@ -1669,12 +1659,9 @@ namespace Ryujinx.Graphics.Gpu.Image
{
if (!_incompatibleOverlaps.Any(overlap => overlap.Group == other.Group))
{
if (copy && other.Compatibility <= TextureViewCompatibility.Incompatible)
if (copy && other.Compatibility <= TextureViewCompatibility.LayoutIncompatible)
{
// Any of the group's views may share compatibility, even if the parents do not fully.
// Fully Incompatible groups are also let through here, since CreateCopyDependency will
// fall back to an exact raw byte copy dependency for them when the strict requirements
// for one are met (see CanCreateRawCopyDependency).
CreateCopyDependency(other.Group, false, other.Compatibility);
}
@@ -1776,7 +1763,7 @@ namespace Ryujinx.Graphics.Gpu.Image
}
}
if (TextureCompatibility.CanTextureFlush(Storage.Info, _context.Capabilities) && !(inBuffer && _flushBufferImported))
if (TextureCompatibility.CanTextureFlush(Storage, _context.Capabilities) && !(inBuffer && _flushBufferImported))
{
FlushSliceRange(false, handle.BaseSlice, handle.BaseSlice + handle.SliceCount, inBuffer, Storage.GetFlushTexture());
}
@@ -1816,3 +1803,4 @@ namespace Ryujinx.Graphics.Gpu.Image
}
}
}
src/Ryujinx.Graphics.Gpu/Image/TextureGroupHandle.cs
-1
View File
@@ -717,7 +717,6 @@ namespace Ryujinx.Graphics.Gpu.Image
}
DeferredCopy = old.DeferredCopy;
DeferredCopyRaw = old.DeferredCopyRaw;
}
}
src/Ryujinx.Graphics.Gpu/Image/TextureManager.cs
+93 -37
View File
@@ -19,12 +19,39 @@ namespace Ryujinx.Graphics.Gpu.Image
private readonly TexturePoolCache _texturePoolCache;
private readonly SamplerPoolCache _samplerPoolCache;
/// <summary>
/// Bound render target texture modification report state.
/// </summary>
[Flags]
private enum BindState : byte
{
/// <summary>
/// Render target texture has not been signalled for modification, and can't be modified on the next render operations.
/// </summary>
None = 0,
/// <summary>
/// Render target texture has been signalled for modification.
/// </summary>
Bound = 1 << 0,
/// <summary>
/// Render target texture might be modified on the next render operations.
/// </summary>
Modified = 1 << 1,
/// <summary>
/// Render target texture has been signalled for modification and might be modified on the next render operations.
/// </summary>
BoundModified = Bound | Modified,
}
private readonly Texture[] _rtColors;
private readonly ITexture[] _rtHostColors;
private readonly bool[] _rtColorsBound;
private readonly BindState[] _rtColorsBound;
private Texture _rtDepthStencil;
private ITexture _rtHostDs;
private bool _rtDsBound;
private BindState _rtDsBound;
public int ClipRegionWidth { get; private set; }
public int ClipRegionHeight { get; private set; }
@@ -55,7 +82,7 @@ namespace Ryujinx.Graphics.Gpu.Image
_rtColors = new Texture[Constants.TotalRenderTargets];
_rtHostColors = new ITexture[Constants.TotalRenderTargets];
_rtColorsBound = new bool[Constants.TotalRenderTargets];
_rtColorsBound = new BindState[Constants.TotalRenderTargets];
}
/// <summary>
@@ -151,27 +178,39 @@ namespace Ryujinx.Graphics.Gpu.Image
/// </summary>
/// <param name="index">The index of the color buffer to set (up to 8)</param>
/// <param name="color">The color buffer texture</param>
/// <param name="modified">Indicates if the following render operations will modidify <paramref name="color"/> contents</param>
/// <returns>True if render target scale must be updated.</returns>
public bool SetRenderTargetColor(int index, Texture color)
public bool SetRenderTargetColor(int index, Texture color, bool modified)
{
bool hasValue = color != null;
bool changesScale = (hasValue != (_rtColors[index] != null)) || (hasValue && RenderTargetScale != color.ScaleFactor);
if (_rtColors[index] != color)
{
if (_rtColorsBound[index])
Texture oldColor = _rtColors[index];
if (oldColor != null)
{
_rtColors[index]?.SignalModifying(false);
}
else
{
_rtColorsBound[index] = true;
if (_rtColorsBound[index].HasFlag(BindState.Bound))
{
oldColor.SignalModifying(false);
}
oldColor.SignalBindingChange(false);
}
_rtColorsBound[index] = modified ? BindState.BoundModified : BindState.None;
if (color != null)
{
color.SynchronizeMemory();
color.SignalModifying(true);
if (modified)
{
color.SignalModifying(true);
}
color.SignalBindingChange(true);
}
_rtColors[index] = color;
@@ -184,27 +223,39 @@ namespace Ryujinx.Graphics.Gpu.Image
/// Sets the render target depth-stencil buffer.
/// </summary>
/// <param name="depthStencil">The depth-stencil buffer texture</param>
/// <param name="modified">Indicates if the following render operations will modidify <paramref name="depthStencil"/> contents</param>
/// <returns>True if render target scale must be updated.</returns>
public bool SetRenderTargetDepthStencil(Texture depthStencil)
public bool SetRenderTargetDepthStencil(Texture depthStencil, bool modified)
{
bool hasValue = depthStencil != null;
bool changesScale = (hasValue != (_rtDepthStencil != null)) || (hasValue && RenderTargetScale != depthStencil.ScaleFactor);
if (_rtDepthStencil != depthStencil)
{
if (_rtDsBound)
Texture oldDepthStencil = _rtDepthStencil;
if (oldDepthStencil != null)
{
_rtDepthStencil?.SignalModifying(false);
}
else
{
_rtDsBound = true;
if (_rtDsBound.HasFlag(BindState.Bound))
{
oldDepthStencil.SignalModifying(false);
}
oldDepthStencil.SignalBindingChange(false);
}
_rtDsBound = modified ? BindState.BoundModified : BindState.None;
if (depthStencil != null)
{
depthStencil.SynchronizeMemory();
depthStencil.SignalModifying(true);
if (modified)
{
depthStencil.SignalModifying(true);
}
depthStencil.SignalBindingChange(true);
}
_rtDepthStencil = depthStencil;
@@ -443,10 +494,10 @@ namespace Ryujinx.Graphics.Gpu.Image
{
hostDsTexture = dsTexture.HostTexture;
if (!_rtDsBound)
if (_rtDsBound == BindState.Modified)
{
dsTexture.SignalModifying(true);
_rtDsBound = true;
_rtDsBound |= BindState.Bound;
}
}
@@ -470,10 +521,10 @@ namespace Ryujinx.Graphics.Gpu.Image
{
hostTexture = texture.HostTexture;
if (!_rtColorsBound[index])
if (_rtColorsBound[index] == BindState.Modified)
{
texture.SignalModifying(true);
_rtColorsBound[index] = true;
_rtColorsBound[index] |= BindState.Bound;
}
}
@@ -518,24 +569,37 @@ namespace Ryujinx.Graphics.Gpu.Image
{
Texture dsTexture = _rtDepthStencil;
if (dsTexture != null && _rtDsBound)
if (dsTexture != null && _rtDsBound.HasFlag(BindState.Bound))
{
dsTexture.SignalModifying(false);
_rtDsBound = false;
_rtDsBound &= ~BindState.Bound;
}
for (int index = 0; index < _rtColors.Length; index++)
{
Texture texture = _rtColors[index];
if (texture != null && _rtColorsBound[index])
if (texture != null && _rtColorsBound[index].HasFlag(BindState.Bound))
{
texture.SignalModifying(false);
_rtColorsBound[index] = false;
_rtColorsBound[index] &= ~BindState.Bound;
}
}
}
/// <summary>
/// Indicates that the currently bound render targets might be modified, if they are used on the next render operation.
/// </summary>
public void SignalRenderTargetsModifiable()
{
_rtDsBound |= BindState.Modified;
for (int index = 0; index < _rtColorsBound.Length; index++)
{
_rtColorsBound[index] |= BindState.Modified;
}
}
/// <summary>
/// Forces the texture and sampler pools to be re-loaded from the cache on next use.
/// </summary>
@@ -572,19 +636,11 @@ namespace Ryujinx.Graphics.Gpu.Image
for (int i = 0; i < _rtColors.Length; i++)
{
if (_rtColorsBound[i])
{
_rtColors[i]?.DecrementReferenceCount();
}
_rtColors[i]?.DecrementReferenceCount();
_rtColors[i] = null;
}
if (_rtDsBound)
{
_rtDepthStencil?.DecrementReferenceCount();
}
_rtDepthStencil?.DecrementReferenceCount();
_rtDepthStencil = null;
}
}
src/Ryujinx.Graphics.Gpu/Memory/SupportBufferUpdater.cs
+32
View File
@@ -129,6 +129,38 @@ namespace Ryujinx.Graphics.Gpu.Memory
}
}
/// <summary>
/// Updates the offset used for accessing buffer textures that are not aligned to the host requirements.
/// </summary>
/// <param name="stageIndex">Index of the shader stage where the texture is used</param>
/// <param name="bindingIndex">Index of the texture binding in the shader</param>
/// <param name="offset">Offset for the misaligned part of the address</param>
public void UpdateBufferTextureOffset(int stageIndex, int bindingIndex, int offset)
{
if (_data.BufferTextureOffset[stageIndex][bindingIndex].X != offset)
{
_data.BufferTextureOffset[stageIndex][bindingIndex].X = offset;
int index = stageIndex * SupportBuffer.TextureCount + bindingIndex;
MarkDirty(SupportBuffer.BufferTextureOffsetOffset + index * sizeof(int) * 4, sizeof(int));
}
}
/// <summary>
/// Updates the offset used for accessing buffer images that are not aligned to the host requirements.
/// </summary>
/// <param name="stageIndex">Index of the shader stage where the image is used</param>
/// <param name="bindingIndex">Index of the image binding in the shader</param>
/// <param name="offset">Offset for the misaligned part of the address</param>
public void UpdateBufferImageOffset(int stageIndex, int bindingIndex, int offset)
{
if (_data.BufferTextureOffset[stageIndex][bindingIndex].Y != offset)
{
_data.BufferTextureOffset[stageIndex][bindingIndex].Y = offset;
int index = stageIndex * SupportBuffer.TextureCount + bindingIndex;
MarkDirty(SupportBuffer.BufferTextureOffsetOffset + index * sizeof(int) * 4 + sizeof(int), sizeof(int));
}
}
/// <summary>
/// Sets whether the format of a given render target is a BGRA format.
/// </summary>
src/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs
+8 -1
View File
@@ -22,7 +22,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
private const ushort FileFormatVersionMajor = 1;
private const ushort FileFormatVersionMinor = 2;
private const uint FileFormatVersionPacked = ((uint)FileFormatVersionMajor << 16) | FileFormatVersionMinor;
private const uint CodeGenVersion = 7354;
private const uint CodeGenVersion = 6371;
private const string SharedTocFileName = "shared.toc";
private const string SharedDataFileName = "shared.data";
@@ -170,6 +170,11 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
/// </summary>
public bool UsesRtLayer;
/// <summary>
/// Indicates that the fragment shader always discards the fragment, not producing any output for the bound render targets.
/// </summary>
public bool HasUnconditionalDiscard;
/// <summary>
/// Bit mask with the clip distances written on the vertex stage.
/// </summary>
@@ -806,6 +811,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
dataInfo.UsesInstanceId,
dataInfo.UsesDrawParameters,
dataInfo.UsesRtLayer,
dataInfo.HasUnconditionalDiscard,
dataInfo.ClipDistancesWritten,
dataInfo.FragmentOutputMap);
}
@@ -836,6 +842,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
UsesInstanceId = info.UsesInstanceId,
UsesDrawParameters = info.UsesDrawParameters,
UsesRtLayer = info.UsesRtLayer,
HasUnconditionalDiscard = info.HasUnconditionalDiscard,
ClipDistancesWritten = info.ClipDistancesWritten,
FragmentOutputMap = info.FragmentOutputMap,
};
src/Ryujinx.Graphics.Gpu/Shader/GpuAccessorBase.cs
+4
View File
@@ -207,6 +207,10 @@ namespace Ryujinx.Graphics.Gpu.Shader
public bool QueryHostSupportsBgraFormat() => _context.Capabilities.SupportsBgraFormat;
public bool QueryHostSupportsBufferImagePixelAlignment() => _context.Capabilities.SupportsImageBufferPixelAlignment;
public bool QueryHostSupportsBufferTexturePixelAlignment() => _context.Capabilities.SupportsTextureBufferPixelAlignment;
public bool QueryHostSupportsFragmentShaderInterlock() => _context.Capabilities.SupportsFragmentShaderInterlock;
public bool QueryHostSupportsFragmentShaderOrderingIntel() => _context.Capabilities.SupportsFragmentShaderOrderingIntel;
src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs
+3 -2
View File
@@ -430,7 +430,8 @@ namespace Ryujinx.Graphics.Gpu.Shader
TranslatorContext lastInVertexPipeline = geometryToCompute ? translatorContexts[4] ?? currentStage : currentStage;
program = lastInVertexPipeline.GenerateVertexPassthroughForCompute();
(program, ShaderProgramInfo vacInfo) = lastInVertexPipeline.GenerateVertexPassthroughForCompute();
infoBuilder.AddStageInfoVac(vacInfo);
}
else
{
@@ -535,7 +536,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
private ShaderAsCompute CreateHostVertexAsComputeProgram(ShaderProgram program, TranslatorContext context, bool tfEnabled)
{
ShaderSource source = new(program.Code, program.BinaryCode, ShaderStage.Compute, program.Language);
ShaderInfo info = ShaderInfoBuilder.BuildForVertexAsCompute(_context, program.Info, tfEnabled);
ShaderInfo info = ShaderInfoBuilder.BuildForVertexAsCompute(_context, program.Info, context.GetVertexAsComputeInfo(), tfEnabled);
return new(_context.Renderer.CreateProgram([source], info), program.Info, context.GetResourceReservations());
}
src/Ryujinx.Graphics.Gpu/Shader/ShaderInfoBuilder.cs
+22 -2
View File
@@ -95,7 +95,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
private void PopulateDescriptorAndUsages(ResourceStages stages, ResourceType type, int setIndex, int start, int count, bool write = false)
{
AddDescriptor(stages, type, setIndex, start, count);
AddUsage(stages, type, setIndex, start, count, write);
// AddUsage(stages, type, setIndex, start, count, write);
}
/// <summary>
@@ -159,6 +159,25 @@ namespace Ryujinx.Graphics.Gpu.Shader
AddUsage(info.Images, stages, isImage: true);
}
public void AddStageInfoVac(ShaderProgramInfo info)
{
ResourceStages stages = info.Stage switch
{
ShaderStage.Compute => ResourceStages.Compute,
ShaderStage.Vertex => ResourceStages.Vertex,
ShaderStage.TessellationControl => ResourceStages.TessellationControl,
ShaderStage.TessellationEvaluation => ResourceStages.TessellationEvaluation,
ShaderStage.Geometry => ResourceStages.Geometry,
ShaderStage.Fragment => ResourceStages.Fragment,
_ => ResourceStages.None,
};
AddUsage(info.CBuffers, stages, isStorage: false);
AddUsage(info.SBuffers, stages, isStorage: true);
AddUsage(info.Textures, stages, isImage: false);
AddUsage(info.Images, stages, isImage: true);
}
/// <summary>
/// Adds a resource descriptor to the list of descriptors.
/// </summary>
@@ -422,10 +441,11 @@ namespace Ryujinx.Graphics.Gpu.Shader
/// <param name="tfEnabled">Indicates if the graphics shader is used with transform feedback enabled</param>
/// <param name="fromCache">True if the compute shader comes from a disk cache, false otherwise</param>
/// <returns>Shader information</returns>
public static ShaderInfo BuildForVertexAsCompute(GpuContext context, ShaderProgramInfo info, bool tfEnabled, bool fromCache = false)
public static ShaderInfo BuildForVertexAsCompute(GpuContext context, ShaderProgramInfo info, ShaderProgramInfo info2, bool tfEnabled, bool fromCache = false)
{
ShaderInfoBuilder builder = new(context, tfEnabled, vertexAsCompute: true);
builder.AddStageInfoVac(info2);
builder.AddStageInfo(info, vertexAsCompute: true);
return builder.Build(null, fromCache);
src/Ryujinx.Graphics.OpenGL/Framebuffer.cs
+2 -36
View File
@@ -20,27 +20,6 @@ namespace Ryujinx.Graphics.OpenGL
private int _colorsCount;
private bool _dualSourceBlend;
public bool HasAttachments
{
get
{
if (_depthStencil != null)
{
return true;
}
for (int index = 0; index < _colors.Length; index++)
{
if (_colors[index] != null)
{
return true;
}
}
return false;
}
}
public Framebuffer()
{
Handle = GL.GenFramebuffer();
@@ -55,12 +34,6 @@ namespace Ryujinx.Graphics.OpenGL
return Handle;
}
public void SetDefaultSize(int width, int height)
{
GL.FramebufferParameter(FramebufferTarget.Framebuffer, FramebufferDefaultParameter.FramebufferDefaultWidth, Math.Max(1, width));
GL.FramebufferParameter(FramebufferTarget.Framebuffer, FramebufferDefaultParameter.FramebufferDefaultHeight, Math.Max(1, height));
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void AttachColor(int index, TextureView color)
{
@@ -132,20 +105,13 @@ namespace Ryujinx.Graphics.OpenGL
_colorsCount = colorsCount;
}
private void SetDrawBuffersImpl(int colorsCount)
private static void SetDrawBuffersImpl(int colorsCount)
{
DrawBuffersEnum[] drawBuffers = new DrawBuffersEnum[colorsCount];
for (int index = 0; index < colorsCount; index++)
{
if (_colors[index] != null)
{
drawBuffers[index] = DrawBuffersEnum.ColorAttachment0 + index;
}
else
{
drawBuffers[index] = DrawBuffersEnum.None;
}
drawBuffers[index] = DrawBuffersEnum.ColorAttachment0 + index;
}
GL.DrawBuffers(colorsCount, drawBuffers);
src/Ryujinx.Graphics.OpenGL/Image/TextureView.cs
+5 -5
View File
@@ -116,8 +116,8 @@ namespace Ryujinx.Graphics.OpenGL.Image
{
TextureView destinationView = (TextureView)destination;
bool srcIsMultisample = Target.IsMultisample;
bool dstIsMultisample = destinationView.Target.IsMultisample;
bool srcIsMultisample = Target.IsMultisample();
bool dstIsMultisample = destinationView.Target.IsMultisample();
if (dstIsMultisample != srcIsMultisample && Info.Format.IsDepthOrStencil())
{
@@ -172,8 +172,8 @@ namespace Ryujinx.Graphics.OpenGL.Image
{
TextureView destinationView = (TextureView)destination;
bool srcIsMultisample = Target.IsMultisample;
bool dstIsMultisample = destinationView.Target.IsMultisample;
bool srcIsMultisample = Target.IsMultisample();
bool dstIsMultisample = destinationView.Target.IsMultisample();
if (dstIsMultisample != srcIsMultisample && Info.Format.IsDepthOrStencil())
{
@@ -216,7 +216,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
Extents2D srcRegion = new(0, 0, Width, Height);
Extents2D dstRegion = new(0, 0, destinationView.Width, destinationView.Height);
if (destinationView.Target.IsMultisample)
if (destinationView.Target.IsMultisample())
{
TextureView intermmediate = _renderer.TextureCopy.IntermediatePool.GetOrCreateWithAtLeast(
Info.Target,
src/Ryujinx.Graphics.OpenGL/OpenGLRenderer.cs
+2
View File
@@ -174,6 +174,7 @@ namespace Ryujinx.Graphics.OpenGL
supportsGeometryShader: true,
supportsGeometryShaderPassthrough: HwCapabilities.SupportsGeometryShaderPassthrough,
supportsTransformFeedback: true,
supportsImageBufferPixelAlignment: false,
supportsImageLoadFormatted: HwCapabilities.SupportsImageLoadFormatted,
supportsLayerVertexTessellation: HwCapabilities.SupportsShaderViewportLayerArray,
supportsMismatchingViewFormat: HwCapabilities.SupportsMismatchingViewFormat,
@@ -185,6 +186,7 @@ namespace Ryujinx.Graphics.OpenGL
supportsShaderBarrierDivergence: !(intelWindows || intelUnix),
supportsShaderFloat64: true,
supportsShaderNonUniformIndexing: false,
supportsTextureBufferPixelAlignment: false,
supportsTextureGatherOffsets: true,
supportsTextureShadowLod: HwCapabilities.SupportsTextureShadowLod,
supportsVertexStoreAndAtomics: true,
src/Ryujinx.Graphics.OpenGL/Pipeline.cs
-5
View File
@@ -1537,11 +1537,6 @@ namespace Ryujinx.Graphics.OpenGL
{
DrawCount++;
if (!_framebuffer.HasAttachments && _viewportArray.Length >= 4)
{
_framebuffer.SetDefaultSize((int)_viewportArray[2], (int)_viewportArray[3]);
}
_unit0Texture?.Bind(0);
}
src/Ryujinx.Graphics.RenderDocApi/Capture.cs
-12
View File
@@ -1,12 +0,0 @@
using System;
namespace Ryujinx.Graphics.RenderDocApi
{
public readonly record struct Capture(int Index, string FileName, DateTime Timestamp)
{
public void SetComments(string comments)
{
RenderDoc.SetCaptureFileComments(FileName, comments);
}
}
}
src/Ryujinx.Graphics.RenderDocApi/CaptureOption.cs
-100
View File
@@ -1,100 +0,0 @@
// ReSharper disable UnusedMember.Global
namespace Ryujinx.Graphics.RenderDocApi
{
public enum CaptureOption
{
/// <summary>
/// specifies whether the application is allowed to enable vsync. Default is on.
/// </summary>
AllowVsync = 0,
/// <summary>
/// specifies whether the application is allowed to enter exclusive fullscreen. Default is on.
/// </summary>
AllowFullscreen = 1,
/// <summary>
/// specifies whether (where possible) API-specific debugging is enabled. Default is off.
/// </summary>
ApiValidation = 2,
/// <summary>
/// specifies whether each API call should save a callstack. Default is off.
/// </summary>
CaptureCallstacks = 3,
/// <summary>
/// specifies whether, if <see cref="CaptureCallstacks"/> is enabled, callstacks are only saved on actions. Default is off.
/// </summary>
CaptureCallstacksOnlyDraws = 4,
/// <summary>
/// specifies a delay in seconds after launching a process to pause, to allow debuggers to attach. <br/>
/// This will only apply to child processes since the delay happens at process startup. Default is 0.
/// </summary>
DelayForDebugger = 5,
/// <summary>
/// specifies whether any mapped memory updates should be bounds-checked for overruns,
/// and uninitialised buffers are initialized to <code>0xDDDDDDDD</code> to catch use of uninitialised data.
/// Only supported on D3D11 and OpenGL. Default is off.
/// </summary>
/// <remarks>
/// This option is only valid for OpenGL and D3D11. Explicit APIs such as D3D12 and Vulkan do
/// not do the same kind of interception &amp; checking, and undefined contents are really undefined.
/// </remarks>
VerifyBufferAccess = 6,
/// <summary>
/// Hooks any system API calls that create child processes, and injects
/// RenderDoc into them recursively with the same options.
/// </summary>
HookIntoChildren = 7,
/// <summary>
/// specifies whether all live resources at the time of capture should be included in the capture,
/// even if they are not referenced by the frame. Default is off.
/// </summary>
RefAllSources = 8,
/// <summary>
/// By default, RenderDoc skips saving initial states for resources where the
/// previous contents don't appear to be used, assuming that writes before
/// reads indicate previous contents aren't used.
/// </summary>
/// <remarks>
/// **NOTE**: As of RenderDoc v1.1 this option has been deprecated. Setting or
/// getting it will be ignored, to allow compatibility with older versions.
/// In v1.1 the option acts as if it's always enabled.
/// </remarks>
SaveAllInitials = 9,
/// <summary>
/// In APIs that allow for the recording of command lists to be replayed later,
/// RenderDoc may choose to not capture command lists before a frame capture is
/// triggered, to reduce overheads. This means any command lists recorded once
/// and replayed many times will not be available and may cause a failure to
/// capture.
/// </summary>
/// <remarks>
/// NOTE: This is only true for APIs where multithreading is difficult or
/// discouraged. Newer APIs like Vulkan and D3D12 will ignore this option
/// and always capture all command lists since the API is heavily oriented
/// around it and the overheads have been reduced by API design.
/// </remarks>
CaptureAllCmdLists = 10,
/// <summary>
/// Mute API debugging output when the <see cref="ApiValidation"/> option is enabled.
/// </summary>
DebugOutputMute = 11,
/// <summary>
/// Allow vendor extensions to be used even when they may be
/// incompatible with RenderDoc and cause corrupted replays or crashes.
/// </summary>
AllowUnsupportedVendorExtensions = 12,
/// <summary>
/// Define a soft memory limit which some APIs may aim to keep overhead under where
/// possible. Anything above this limit will where possible be saved directly to disk during
/// capture.<br/>
/// This will cause increased disk space use (which may cause a capture to fail if disk space is
/// exhausted) as well as slower capture times.
/// <br/><br/>
/// Not all memory allocations may be deferred like this so it is not a guarantee of a memory
/// limit.
/// <br/><br/>
/// Units are in MBs, suggested values would range from 200MB to 1000MB.
/// </summary>
SoftMemoryLimit = 13,
}
}
src/Ryujinx.Graphics.RenderDocApi/InputButton.cs
-83
View File
@@ -1,83 +0,0 @@
// ReSharper disable UnusedMember.Global
namespace Ryujinx.Graphics.RenderDocApi
{
public enum InputButton
{
// '0' - '9' matches ASCII values
Key0 = 0x30,
Key1 = 0x31,
Key2 = 0x32,
Key3 = 0x33,
Key4 = 0x34,
Key5 = 0x35,
Key6 = 0x36,
Key7 = 0x37,
Key8 = 0x38,
Key9 = 0x39,
// 'A' - 'Z' matches ASCII values
A = 0x41,
B = 0x42,
C = 0x43,
D = 0x44,
E = 0x45,
F = 0x46,
G = 0x47,
H = 0x48,
I = 0x49,
J = 0x4A,
K = 0x4B,
L = 0x4C,
M = 0x4D,
N = 0x4E,
O = 0x4F,
P = 0x50,
Q = 0x51,
R = 0x52,
S = 0x53,
T = 0x54,
U = 0x55,
V = 0x56,
W = 0x57,
X = 0x58,
Y = 0x59,
Z = 0x5A,
// leave the rest of the ASCII range free
// in case we want to use it later
NonPrintable = 0x100,
Divide,
Multiply,
Subtract,
Plus,
F1,
F2,
F3,
F4,
F5,
F6,
F7,
F8,
F9,
F10,
F11,
F12,
Home,
End,
Insert,
Delete,
PageUp,
PageDn,
Backspace,
Tab,
PrtScrn,
Pause,
Max,
}
}
src/Ryujinx.Graphics.RenderDocApi/OverlayBits.cs
-39
View File
@@ -1,39 +0,0 @@
// ReSharper disable UnusedMember.Global
using System;
namespace Ryujinx.Graphics.RenderDocApi
{
[Flags]
public enum OverlayBits
{
/// <summary>
/// This single bit controls whether the overlay is enabled or disabled globally
/// </summary>
Enabled = 1 << 0,
/// <summary>
/// Show the average framerate over several seconds as well as min/max
/// </summary>
FrameRate = 1 << 1,
/// <summary>
/// Show the current frame number
/// </summary>
FrameNumber = 1 << 2,
/// <summary>
/// Show a list of recent captures, and how many captures have been made
/// </summary>
CaptureList = 1 << 3,
/// <summary>
/// Default values for the overlay mask
/// </summary>
Default = Enabled | FrameRate | FrameNumber | CaptureList,
/// <summary>
/// Enable all bits
/// </summary>
All = ~0,
/// <summary>
/// Disable all bits
/// </summary>
None = 0
}
}
src/Ryujinx.Graphics.RenderDocApi/README.md
-5
View File
@@ -1,5 +0,0 @@
# Ryujinx.Graphics.RenderDocApi
This is a C# binding for RenderDoc's application API.
This is a source-inclusion of https://github.com/utkumaden/RenderdocSharp.
I didn't use the NuGet package as I had a few minor changes I wanted to make, and I want to learn from it as well via hands-on experience.
src/Ryujinx.Graphics.RenderDocApi/RenderDoc.cs
-639
View File
@@ -1,639 +0,0 @@
using System;
using System.Collections.Immutable;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Text;
using System.Text.RegularExpressions;
namespace Ryujinx.Graphics.RenderDocApi
{
public static unsafe partial class RenderDoc
{
/// <summary>
/// True if the API is available.
/// </summary>
public static bool IsAvailable => Api != null;
/// <summary>
/// Set the minimum version of the API you require.
/// </summary>
/// <remarks>Set this before you do anything else with the RenderDoc API, including <see cref="IsAvailable"/>.</remarks>
public static RenderDocVersion MinimumRequired { get; set; } = RenderDocVersion.Version_1_0_0;
/// <summary>
/// Set to true to assert versions.
/// </summary>
public static bool AssertVersionEnabled { get; set; } = true;
/// <summary>
/// Version of the API available.
/// </summary>
[MemberNotNullWhen(true, nameof(IsAvailable))]
public static Version? Version
{
get
{
if (!IsAvailable)
return null;
int major, minor, build;
Api->GetApiVersion(&major, &minor, &build);
return new Version(major, minor, build);
}
}
/// <summary>
/// The current mask which determines what sections of the overlay render on each window.
/// </summary>
[RenderDocApiVersion(1, 0)]
public static OverlayBits OverlayBits
{
get => Api->GetOverlayBits();
set
{
Api->MaskOverlayBits(~value, value);
}
}
/// <summary>
/// The template for new captures.<br/>
/// The template can either be a relative or absolute path, which determines where captures will be saved and how they will be named.
/// If the path template is 'my_captures/example', then captures saved will be e.g.
/// 'my_captures/example_frame123.rdc' and 'my_captures/example_frame456.rdc'.<br/>
/// Relative paths will be saved relative to the process’s current working directory.<br/>
/// </summary>
/// <remarks>The default template is in a folder controlled by the UI - initially the system temporary folder, and the filename is the executable’s filename.</remarks>
[RenderDocApiVersion(1, 0)]
public static string CaptureFilePathTemplate
{
get
{
byte* ptr = Api->GetCaptureFilePathTemplate();
return Marshal.PtrToStringUTF8((nint)ptr)!;
}
set
{
fixed (byte* ptr = value.ToNullTerminatedByteArray())
{
Api->SetCaptureFilePathTemplate(ptr);
}
}
}
/// <summary>
/// The amount of frame captures that have been made.
/// </summary>
[RenderDocApiVersion(1, 0)]
public static int CaptureCount => Api->GetNumCaptures();
/// <summary>
/// Checks if the RenderDoc UI is currently connected to this process.
/// </summary>
[RenderDocApiVersion(1, 0)]
public static bool IsTargetControlConnected => Api is not null && Api->IsTargetControlConnected() != 0;
/// <summary>
/// Checks if the current frame is capturing.
/// </summary>
[RenderDocApiVersion(1, 0)]
public static bool IsFrameCapturing => Api is not null && Api->IsFrameCapturing() != 0;
/// <summary>
/// Set one of the options for tweaking some behaviors of capturing.
/// </summary>
/// <param name="option">specifies which capture option should be set.</param>
/// <param name="integer">the unsigned integer value to set for the option.</param>
/// <remarks>Note that each option only takes effect from after it is set - so it is advised to set these options as early as possible, ideally before any graphics API has been initialized.</remarks>
/// <returns>
/// true, if the <paramref name="option"/> is valid, and the value set on the option is within valid ranges.<br/>
/// false, if the option is not a <see cref="CaptureOption"/>, or the value is not valid for the option.
/// </returns>
[RenderDocApiVersion(1, 0)]
public static bool SetCaptureOption(CaptureOption option, uint integer)
{
return Api is not null && Api->SetCaptureOptionU32(option, integer) != 0;
}
/// <summary>
/// Set one of the options for tweaking some behaviors of capturing.
/// </summary>
/// <param name="option">specifies which capture option should be set.</param>
/// <param name="boolean">the value to set for the option, converted to a 0 or 1 before setting.</param>
/// <remarks>Note that each option only takes effect from after it is set - so it is advised to set these options as early as possible, ideally before any graphics API has been initialized.</remarks>
/// <returns>
/// true, if the <paramref name="option"/> is valid, and the value set on the option is within valid ranges.<br/>
/// false, if the option is not a <see cref="CaptureOption"/>, or the value is not valid for the option.
/// </returns>
[RenderDocApiVersion(1, 0)]
public static bool SetCaptureOption(CaptureOption option, bool boolean)
=> SetCaptureOption(option, boolean ? 1 : 0);
/// <summary>
/// Set one of the options for tweaking some behaviors of capturing.
/// </summary>
/// <param name="option">specifies which capture option should be set.</param>
/// <param name="single">the floating point value to set for the option.</param>
/// <remarks>Note that each option only takes effect from after it is set - so it is advised to set these options as early as possible, ideally before any graphics API has been initialized.</remarks>
/// <returns>
/// true, if the <paramref name="option"/> is valid, and the value set on the option is within valid ranges.<br/>
/// false, if the option is not a <see cref="CaptureOption"/>, or the value is not valid for the option.
/// </returns>
[RenderDocApiVersion(1, 0)]
public static bool SetCaptureOption(CaptureOption option, float single)
{
return Api is not null && Api->SetCaptureOptionF32(option, single) != 0;
}
/// <summary>
/// Gets the current value of one of the different options in <see cref="CaptureOption"/>, writing it to an out parameter.
/// </summary>
/// <param name="option">specifies which capture option should be retrieved.</param>
/// <param name="integer">the value of the capture option, if the option is a valid <see cref="CaptureOption"/> enum. Otherwise, <see cref="int.MaxValue"/>.</param>
[RenderDocApiVersion(1, 0)]
public static void GetCaptureOption(CaptureOption option, out uint integer)
{
integer = Api->GetCaptureOptionU32(option);
}
/// <summary>
/// Gets the current value of one of the different options in <see cref="CaptureOption"/>, writing it to an out parameter.
/// </summary>
/// <param name="option">specifies which capture option should be retrieved.</param>
/// <param name="single">the value of the capture option, if the option is a valid <see cref="CaptureOption"/> enum. Otherwise, -<see cref="float.MaxValue"/>.</param>
[RenderDocApiVersion(1, 0)]
public static void GetCaptureOption(CaptureOption option, out float single)
{
single = Api->GetCaptureOptionF32(option);
}
/// <summary>
/// Gets the current value of one of the different options in <see cref="CaptureOption"/>,
/// converted to a boolean.
/// </summary>
/// <param name="option">specifies which capture option should be retrieved.</param>
/// <returns>
/// the value of the capture option, converted to bool, if the option is a valid <see cref="CaptureOption"/> enum.
/// Otherwise, returns null.
/// </returns>
[RenderDocApiVersion(1, 0)]
public static bool? GetCaptureOptionBool(CaptureOption option)
{
if (Api is null) return false;
uint returnVal = GetCaptureOptionU32(option);
if (returnVal == uint.MaxValue)
return null;
return returnVal is not 0;
}
/// <summary>
/// Gets the current value of one of the different options in <see cref="CaptureOption"/>.
/// </summary>
/// <param name="option">specifies which capture option should be retrieved.</param>
/// <returns>
/// the value of the capture option, if the option is a valid <see cref="CaptureOption"/> enum.
/// Otherwise, returns <see cref="int.MaxValue"/>.
/// </returns>
[RenderDocApiVersion(1, 0)]
public static uint GetCaptureOptionU32(CaptureOption option) => Api->GetCaptureOptionU32(option);
/// <summary>
/// Gets the current value of one of the different options in <see cref="CaptureOption"/>.
/// </summary>
/// <param name="option">specifies which capture option should be retrieved.</param>
/// <returns>
/// the value of the capture option, if the option is a valid <see cref="CaptureOption"/> enum.
/// Otherwise, returns -<see cref="float.MaxValue"/>.
/// </returns>
[RenderDocApiVersion(1, 0)]
public static float GetCaptureOptionF32(CaptureOption option) => Api->GetCaptureOptionF32(option);
/// <summary>
/// Changes the key bindings in-application for changing the focussed window.
/// </summary>
/// <param name="buttons">lists the keys to bind.</param>
[RenderDocApiVersion(1, 0)]
public static void SetFocusToggleKeys(ReadOnlySpan<InputButton> buttons)
{
if (Api is null) return;
fixed (InputButton* ptr = buttons)
{
Api->SetFocusToggleKeys(ptr, buttons.Length);
}
}
/// <summary>
/// Changes the key bindings in-application for triggering a capture on the current window.
/// </summary>
/// <param name="buttons">lists the keys to bind.</param>
[RenderDocApiVersion(1, 0)]
public static void SetCaptureKeys(ReadOnlySpan<InputButton> buttons)
{
if (Api is null) return;
fixed (InputButton* ptr = buttons)
{
Api->SetCaptureKeys(ptr, buttons.Length);
}
}
/// <summary>
/// Attempts to remove RenderDoc and its hooks from the target process.<br/>
/// It must be called as early as possible in the process, and will have undefined results
/// if any graphics API functions have been called.
/// </summary>
[RenderDocApiVersion(1, 0)]
public static void RemoveHooks()
{
if (Api is null) return;
Api->RemoveHooks();
}
/// <summary>
/// Remove RenderDoc’s crash handler from the target process.<br/>
/// If you have your own crash handler that you want to handle any exceptions,
/// RenderDoc’s handler could interfere; so it can be disabled.
/// </summary>
[RenderDocApiVersion(1, 0)]
public static void UnloadCrashHandler()
{
if (Api is null) return;
Api->UnloadCrashHandler();
}
/// <summary>
/// Trigger a capture as if the user had pressed one of the capture hotkeys.<br/>
/// The capture will be taken from the next frame presented to whichever window is considered current.
/// </summary>
[RenderDocApiVersion(1, 0)]
public static void TriggerCapture()
{
if (Api is null) return;
Api->TriggerCapture();
}
/// <summary>
/// Gets the details of all frame capture in the current session.
/// This simply calls <see cref="GetCapture"/> for each index available as specified by <see cref="CaptureCount"/>.
/// </summary>
/// <returns>An immutable array of structs representing RenderDoc Captures.</returns>
public static ImmutableArray<Capture> GetCaptures()
{
if (Api is null) return [];
int captureCount = CaptureCount;
if (captureCount is 0) return [];
ImmutableArray<Capture>.Builder captures = ImmutableArray.CreateBuilder<Capture>(captureCount);
for (int captureIndex = 0; captureIndex < captureCount; captureIndex++)
{
if (GetCapture(captureIndex) is { } capture)
captures.Add(capture);
}
return captures.DrainToImmutable();
}
/// <summary>
/// Gets the details of a particular frame capture, as specified by an index from 0 to <see cref="CaptureCount"/> - 1.
/// </summary>
/// <param name="index">specifies which capture to return the details of. Must be less than the value returned by <see cref="CaptureCount"/>.</param>
/// <returns>A struct representing a RenderDoc Capture.</returns>
[RenderDocApiVersion(1, 0)]
public static Capture? GetCapture(int index)
{
if (Api is null) return null;
int length = 0;
if (Api->GetCapture(index, null, &length, null) == 0)
{
return null;
}
Span<byte> bytes = stackalloc byte[length + 1];
long timestamp;
fixed (byte* ptr = bytes)
Api->GetCapture(index, ptr, &length, &timestamp);
string fileName = Encoding.UTF8.GetString(bytes[length..]);
return new Capture(index, fileName, DateTimeOffset.FromUnixTimeSeconds(timestamp).DateTime);
}
/// <summary>
/// Determine the closest matching replay UI executable for the current RenderDoc module, and launch it.
/// </summary>
/// <param name="connectTargetControl">if the UI should immediately connect to the application.</param>
/// <param name="commandLine">string to be appended to the command line, e.g. a capture filename. If this parameter is null, the command line will be unmodified.</param>
/// <returns>true if the UI was successfully launched; false otherwise.</returns>
[RenderDocApiVersion(1, 0)]
public static bool LaunchReplayUI(bool connectTargetControl, string? commandLine = null)
{
if (Api is null) return false;
if (commandLine == null)
{
return Api->LaunchReplayUI(connectTargetControl ? 1u : 0u, null) != 0;
}
fixed (byte* ptr = commandLine.ToNullTerminatedByteArray())
{
return Api->LaunchReplayUI(connectTargetControl ? 1u : 0u, ptr) != 0;
}
}
/// <summary>
/// Explicitly sets which window is considered active.<br/>
/// The active window is the one that will be captured when the keybind to trigger a capture is pressed.
/// </summary>
/// <param name="hDevice">a handle to the API ‘device’ object that will be set active. Must be valid.</param>
/// <param name="hWindow">a handle to the platform window handle that will be set active. Must be valid.</param>
[RenderDocApiVersion(1, 0)]
public static void SetActiveWindow(nint hDevice, nint hWindow)
{
if (Api is null) return;
Api->SetActiveWindow((void*)hDevice, (void*)hWindow);
}
/// <summary>
/// Immediately begin a capture for the specified device/window combination.
/// </summary>
/// <param name="hDevice">a handle to the API ‘device’ object that will be set active. May be <see cref="nint.Zero"/> to wildcard match.</param>
/// <param name="hWindow">a handle to the platform window handle that will be set active. May be <see cref="nint.Zero"/> to wildcard match.</param>
[RenderDocApiVersion(1, 0)]
public static void StartFrameCapture(nint hDevice, nint hWindow)
{
if (Api is null) return;
Api->StartFrameCapture((void*)hDevice, (void*)hWindow);
}
/// <summary>
/// Immediately end an active capture for the specified device/window combination.
/// </summary>
/// <param name="hDevice">a handle to the API ‘device’ object that will be set active. May be <see cref="nint.Zero"/> to wildcard match.</param>
/// <param name="hWindow">a handle to the platform window handle that will be set active. May be <see cref="nint.Zero"/> to wildcard match.</param>
/// <returns>true if the capture succeeded; false otherwise.</returns>
[RenderDocApiVersion(1, 0)]
public static bool EndFrameCapture(nint hDevice, nint hWindow)
{
if (Api is null) return false;
return Api->EndFrameCapture((void*)hDevice, (void*)hWindow) != 0;
}
/// <summary>
/// Trigger multiple sequential frame captures as if the user had pressed one of the capture hotkeys before each frame.<br/>
/// The captures will be taken from the next frames presented to whichever window is considered current.<br/>
/// Each capture will be taken independently and saved to a separate file, with no reference to the other frames.
/// </summary>
/// <param name="numFrames">the number of frames to capture.</param>
/// <remarks>Requires RenderDoc API version 1.1</remarks>
[RenderDocApiVersion(1, 1)]
public static void TriggerMultiFrameCapture(uint numFrames)
{
if (Api is null) return;
AssertAtLeast(1, 1);
Api->TriggerMultiFrameCapture(numFrames);
}
/// <summary>
/// Adds an arbitrary comments field to the most recent capture,
/// which will then be displayed in the UI to anyone opening the capture.
/// <br/><br/>
/// This is equivalent to calling <see cref="SetCaptureFileComments"/> with a null first (fileName) parameter.
/// </summary>
/// <param name="comments">the comments to set in the capture file.</param>
/// <remarks>Requires RenderDoc API version 1.2</remarks>
public static void SetMostRecentCaptureFileComments(string comments)
{
if (Api is null) return;
AssertAtLeast(1, 2);
byte[] commentBytes = comments.ToNullTerminatedByteArray();
fixed (byte* pcomment = commentBytes)
{
Api->SetCaptureFileComments((byte*)nint.Zero, pcomment);
}
}
/// <summary>
/// Adds an arbitrary comments field to an existing capture on disk,
/// which will then be displayed in the UI to anyone opening the capture.
/// </summary>
/// <param name="fileName">the path to the capture file to set comments in. If this path is null or an empty string, the most recent capture file that has been created will be used.</param>
/// <param name="comments">the comments to set in the capture file.</param>
/// <remarks>Requires RenderDoc API version 1.2</remarks>
[RenderDocApiVersion(1, 2)]
public static void SetCaptureFileComments(string? fileName, string comments)
{
if (Api is null) return;
AssertAtLeast(1, 2);
byte[] commentBytes = comments.ToNullTerminatedByteArray();
fixed (byte* pcomment = commentBytes)
{
if (fileName is null)
{
Api->SetCaptureFileComments((byte*)nint.Zero, pcomment);
}
else
{
byte[] fileBytes = fileName.ToNullTerminatedByteArray();
fixed (byte* pfile = fileBytes)
{
Api->SetCaptureFileComments(pfile, pcomment);
}
}
}
}
/// <summary>
/// Similar to <see cref="EndFrameCapture"/>, but the capture contents will be discarded immediately, and not processed and written to disk.<br/>
/// This will be more efficient than <see cref="EndFrameCapture"/> if the frame capture is not needed.
/// </summary>
/// <param name="hDevice">a handle to the API ‘device’ object that will be set active. May be <see cref="nint.Zero"/> to wildcard match.</param>
/// <param name="hWindow">a handle to the platform window handle that will be set active. May be <see cref="nint.Zero"/> to wildcard match.</param>
/// <returns>true if the capture was discarded; false if there was an error or no capture was in progress.</returns>
/// <remarks>Requires RenderDoc API version 1.4</remarks>
[RenderDocApiVersion(1, 4)]
public static bool DiscardFrameCapture(nint hDevice, nint hWindow)
{
if (Api is null) return false;
AssertAtLeast(1, 4);
return Api->DiscardFrameCapture((void*)hDevice, (void*)hWindow) != 0;
}
/// <summary>
/// Requests that the currently connected replay UI raise its window to the top.<br/>
/// This is only possible if an instance of the replay UI is currently connected, otherwise this method does nothing.<br/>
/// This can be used in conjunction with <see cref="IsTargetControlConnected"/> and <see cref="LaunchReplayUI"/>,<br/> to intelligently handle showing the UI after making a capture.<br/><br/>
/// Given OS differences, it is not guaranteed that the UI will be successfully raised even if the request is passed on.<br/>
/// On some systems it may only be highlighted or otherwise indicated to the user.
/// </summary>
/// <returns>true if the request was passed onto the UI successfully; false if there is no UI connected or some other error occurred.</returns>
/// <remarks>Requires RenderDoc API version 1.5</remarks>
[RenderDocApiVersion(1, 5)]
public static bool ShowReplayUI()
{
if (Api is null) return false;
AssertAtLeast(1, 5);
return Api->ShowReplayUI() != 0;
}
/// <summary>
/// Sets a given title for the currently in-progress capture, which will be displayed in the UI.<br/>
/// This can be used either with a user-defined capture using a manual start and end,
/// or an automatic capture triggered by <see cref="TriggerCapture"/> or a keypress.<br/>
/// If multiple captures are ongoing at once, the title will be applied to the first capture to end only.<br/>
/// Any subsequent captures will not get any title unless the function is called again.
/// This function can only be called while a capture is in-progress,
/// after <see cref="StartFrameCapture"/> and before <see cref="EndFrameCapture"/>.<br/>
/// If it is called elsewhere it will have no effect.
/// If it is called multiple times within a capture, only the last title will have any effect.
/// </summary>
/// <param name="title">The title to set for the in-progress capture.</param>
/// <remarks>Requires RenderDoc API version 1.6</remarks>
[RenderDocApiVersion(1, 6)]
public static void SetCaptureTitle(string title)
{
if (Api is null) return;
AssertAtLeast(1, 6);
fixed (byte* ptr = title.ToNullTerminatedByteArray())
Api->SetCaptureTitle(ptr);
}
#region Dynamic Library loading
/// <summary>
/// Reload the internal RenderDoc API structure. Useful for manually refreshing <see cref="Api"/> while using process injection.
/// </summary>
/// <param name="ignoreAlreadyLoaded">Ignores the existing API function structure and overwrites it with a re-request.</param>
/// <param name="requiredVersion">The version of the RenderDoc API required by your application.</param>
public static void ReloadApi(bool ignoreAlreadyLoaded = false, RenderDocVersion? requiredVersion = null)
{
if (_loaded && !ignoreAlreadyLoaded)
return;
lock (typeof(RenderDoc))
{
// Prevent double loads.
if (_loaded && !ignoreAlreadyLoaded)
return;
if (requiredVersion.HasValue)
MinimumRequired = requiredVersion.Value;
_loaded = true;
_api = GetApi(MinimumRequired);
if (_api != null)
AssertAtLeast(MinimumRequired);
}
}
private static RenderDocApi* _api = null;
private static bool _loaded;
private static RenderDocApi* Api
{
get
{
ReloadApi();
return _api;
}
}
private static readonly Regex _dynamicLibraryPattern = RenderDocApiDynamicLibraryRegex();
private static RenderDocApi* GetApi(RenderDocVersion minimumRequired = RenderDocVersion.Version_1_0_0)
{
foreach (ProcessModule module in Process.GetCurrentProcess().Modules)
{
string moduleName = module.FileName ?? string.Empty;
if (!_dynamicLibraryPattern.IsMatch(moduleName))
continue;
if (!NativeLibrary.TryLoad(moduleName, out nint moduleHandle))
return null;
if (!NativeLibrary.TryGetExport(moduleHandle, "RENDERDOC_GetAPI", out nint procAddress))
return null;
var RENDERDOC_GetApi = (delegate* unmanaged[Cdecl]<RenderDocVersion, RenderDocApi**, int>)procAddress;
RenderDocApi* api;
return RENDERDOC_GetApi(minimumRequired, &api) != 0 ? api : null;
}
return null;
}
private static void AssertAtLeast(RenderDocVersion rdv, [CallerMemberName] string callee = "")
{
Version ver = rdv.SystemVersion;
AssertAtLeast(ver.Major, ver.Minor, ver.Build, callee);
}
private static void AssertAtLeast(int major, int minor, int patch = 0, [CallerMemberName] string callee = "")
{
if (!AssertVersionEnabled)
return;
if (Version!.Major < major)
goto fail;
if (Version.Major > major)
goto success;
if (Version.Minor < minor)
goto fail;
if (Version.Minor > minor)
goto success;
if (Version.Build < patch)
goto fail;
success:
return;
fail:
Version minVersion =
typeof(RenderDoc).GetMethod(callee)!.GetCustomAttribute<RenderDocApiVersionAttribute>()!.MinVersion;
throw new NotSupportedException(
$"This API was introduced in RenderDoc API {minVersion}. Current API version is {Version}.");
}
private static byte[] ToNullTerminatedByteArray(this string str, Encoding? encoding = null)
{
encoding ??= Encoding.UTF8;
return encoding.GetBytes(str + '\0');
}
[GeneratedRegex(@"(lib)?renderdoc(\.dll|\.so|\.dylib)(\.\d+)?",
RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
private static partial Regex RenderDocApiDynamicLibraryRegex();
#endregion
}
}
src/Ryujinx.Graphics.RenderDocApi/RenderDocApi.cs
-51
View File
@@ -1,51 +0,0 @@
namespace Ryujinx.Graphics.RenderDocApi
{
#pragma warning disable CS0649
internal unsafe struct RenderDocApi
{
public delegate* unmanaged[Cdecl]<int*, int*, int*, void> GetApiVersion;
public delegate* unmanaged[Cdecl]<CaptureOption, uint, int> SetCaptureOptionU32;
public delegate* unmanaged[Cdecl]<CaptureOption, float, int> SetCaptureOptionF32;
public delegate* unmanaged[Cdecl]<CaptureOption, uint> GetCaptureOptionU32;
public delegate* unmanaged[Cdecl]<CaptureOption, float> GetCaptureOptionF32;
public delegate* unmanaged[Cdecl]<InputButton*, int, void> SetFocusToggleKeys;
public delegate* unmanaged[Cdecl]<InputButton*, int, void> SetCaptureKeys;
public delegate* unmanaged[Cdecl]<OverlayBits> GetOverlayBits;
public delegate* unmanaged[Cdecl]<OverlayBits, OverlayBits, void> MaskOverlayBits;
public delegate* unmanaged[Cdecl]<void> RemoveHooks;
public delegate* unmanaged[Cdecl]<void> UnloadCrashHandler;
public delegate* unmanaged[Cdecl]<byte*, void> SetCaptureFilePathTemplate;
public delegate* unmanaged[Cdecl]<byte*> GetCaptureFilePathTemplate;
public delegate* unmanaged[Cdecl]<int> GetNumCaptures;
public delegate* unmanaged[Cdecl]<int, byte*, int*, long*, uint> GetCapture;
public delegate* unmanaged[Cdecl]<void> TriggerCapture;
public delegate* unmanaged[Cdecl]<uint> IsTargetControlConnected;
public delegate* unmanaged[Cdecl]<uint, byte*, uint> LaunchReplayUI;
public delegate* unmanaged[Cdecl]<void*, void*, void> SetActiveWindow;
public delegate* unmanaged[Cdecl]<void*, void*, void> StartFrameCapture;
public delegate* unmanaged[Cdecl]<uint> IsFrameCapturing;
public delegate* unmanaged[Cdecl]<void*, void*, uint> EndFrameCapture;
// 1.1
public delegate* unmanaged[Cdecl]<uint, void> TriggerMultiFrameCapture;
// 1.2
public delegate* unmanaged[Cdecl]<byte*, byte*, void> SetCaptureFileComments;
// 1.3
public delegate* unmanaged[Cdecl]<void*, void*, uint> DiscardFrameCapture;
// 1.5
public delegate* unmanaged[Cdecl]<uint> ShowReplayUI;
// 1.6
public delegate* unmanaged[Cdecl]<byte*, void> SetCaptureTitle;
}
#pragma warning restore CS0649
}
src/Ryujinx.Graphics.RenderDocApi/RenderDocApiVersionAttribute.cs
-16
View File
@@ -1,16 +0,0 @@
using System;
namespace Ryujinx.Graphics.RenderDocApi
{
[AttributeUsage(AttributeTargets.Method | AttributeTargets.Property)]
public sealed class RenderDocApiVersionAttribute : Attribute
{
public Version MinVersion { get; }
public RenderDocApiVersionAttribute(int major, int minor, int patch = 0)
{
MinVersion = new Version(major, minor, patch);
}
}
}
src/Ryujinx.Graphics.RenderDocApi/RenderDocVersion.cs
-47
View File
@@ -1,47 +0,0 @@
using System;
namespace Ryujinx.Graphics.RenderDocApi
{
public enum RenderDocVersion
{
Version_1_0_0 = 10000,
Version_1_0_1 = 10001,
Version_1_0_2 = 10002,
Version_1_1_0 = 10100,
Version_1_1_1 = 10101,
Version_1_1_2 = 10102,
Version_1_2_0 = 10200,
Version_1_3_0 = 10300,
Version_1_4_0 = 10400,
Version_1_4_1 = 10401,
Version_1_4_2 = 10402,
Version_1_5_0 = 10500,
Version_1_6_0 = 10600,
}
public static partial class Helpers
{
extension(RenderDocVersion rdv)
{
public Version SystemVersion
{
get
{
int i = (int)rdv;
return new (i / 10000, (i % 10000) / 100, i % 100);
}
}
}
extension(Version sv)
{
public RenderDocVersion RenderDocVersion
{
get
{
return (RenderDocVersion)(sv.Major * 10000 + sv.Minor * 100 + sv.Build);
}
}
}
}
}
src/Ryujinx.Graphics.RenderDocApi/Ryujinx.Graphics.RenderDocApi.csproj
-9
View File
@@ -1,9 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
</Project>
src/Ryujinx.Graphics.Shader/CodeGen/Spirv/Instructions.cs
+1 -1
View File
@@ -1790,7 +1790,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
{
(_, varType) = IoMap.GetSpirvBuiltIn(ioVariable);
if (context.Definitions.Stage.IsVtg() && IoMap.IsPerVertexBuiltIn(ioVariable))
if (IoMap.IsPerVertexBuiltIn(ioVariable))
{
perVertexBuiltIn = ioVariable;
ioVariable = IoVariable.Position;
src/Ryujinx.Graphics.Shader/Decoders/InstDecoders.cs
+1
View File
@@ -522,6 +522,7 @@ namespace Ryujinx.Graphics.Shader.Decoders
enum PMode
{
Idx = 0,
F4e = 1,
B4e = 2,
Rc8 = 3,
src/Ryujinx.Graphics.Shader/IGpuAccessor.cs
+18
View File
@@ -234,6 +234,24 @@ namespace Ryujinx.Graphics.Shader
return true;
}
/// <summary>
/// Queries host support for buffer image access with the buffer offset aligned to a single pixel rather than a fixed alignment.
/// </summary>
/// <returns>True if the host supports buffer image access with pixel alignment, false otherwise</returns>
bool QueryHostSupportsBufferImagePixelAlignment()
{
return true;
}
/// <summary>
/// Queries host support for buffer texture access with the buffer offset aligned to a single pixel rather than a fixed alignment.
/// </summary>
/// <returns>True if the host supports buffer texture access with pixel alignment, false otherwise</returns>
bool QueryHostSupportsBufferTexturePixelAlignment()
{
return true;
}
/// <summary>
/// Queries host support for fragment shader ordering critical sections on the shader code.
/// </summary>
src/Ryujinx.Graphics.Shader/Instructions/InstEmit.cs
-28
View File
@@ -215,34 +215,6 @@ namespace Ryujinx.Graphics.Shader.Instructions
context.TranslatorContext.GpuAccessor.Log("Shader instruction Pret is not implemented.");
}
public static void PrmtR(EmitterContext context)
{
context.GetOp<InstPrmtR>();
context.TranslatorContext.GpuAccessor.Log("Shader instruction PrmtR is not implemented.");
}
public static void PrmtI(EmitterContext context)
{
context.GetOp<InstPrmtI>();
context.TranslatorContext.GpuAccessor.Log("Shader instruction PrmtI is not implemented.");
}
public static void PrmtC(EmitterContext context)
{
context.GetOp<InstPrmtC>();
context.TranslatorContext.GpuAccessor.Log("Shader instruction PrmtC is not implemented.");
}
public static void PrmtRc(EmitterContext context)
{
context.GetOp<InstPrmtRc>();
context.TranslatorContext.GpuAccessor.Log("Shader instruction PrmtRc is not implemented.");
}
public static void R2b(EmitterContext context)
{
context.GetOp<InstR2b>();
src/Ryujinx.Graphics.Shader/Instructions/InstEmitMove.cs
+88 -26
View File
@@ -1,7 +1,7 @@
using Ryujinx.Graphics.Shader.Decoders;
using Ryujinx.Graphics.Shader.IntermediateRepresentation;
using Ryujinx.Graphics.Shader.Translation;
using System;
using static Ryujinx.Graphics.Shader.Instructions.InstEmitHelper;
using static Ryujinx.Graphics.Shader.IntermediateRepresentation.OperandHelper;
@@ -37,6 +37,38 @@ namespace Ryujinx.Graphics.Shader.Instructions
context.Copy(GetDest(op.Dest), GetSrcImm(context, op.Imm32));
}
public static void PrmtR(EmitterContext context)
{
context.GetOp<InstPrmtR>();
context.TranslatorContext.GpuAccessor.Log("Shader instruction PrmtR is not implemented.");
}
public static void PrmtI(EmitterContext context)
{
InstPrmtI op = context.GetOp<InstPrmtI>();
Operand op1 = GetSrcReg(context, op.SrcA);
Operand control = GetSrcImm(context, op.Imm20);
Operand op2 = GetSrcReg(context, op.SrcC);
EmitPrmt(context, op1, control, op2, op.PMode, op.Dest);
}
public static void PrmtC(EmitterContext context)
{
context.GetOp<InstPrmtC>();
context.TranslatorContext.GpuAccessor.Log("Shader instruction PrmtC is not implemented.");
}
public static void PrmtRc(EmitterContext context)
{
context.GetOp<InstPrmtRc>();
context.TranslatorContext.GpuAccessor.Log("Shader instruction PrmtRc is not implemented.");
}
public static void R2pR(EmitterContext context)
{
InstR2pR op = context.GetOp<InstR2pR>();
@@ -169,6 +201,39 @@ namespace Ryujinx.Graphics.Shader.Instructions
context.Copy(GetDest(op.Dest), src);
}
public static void SelR(EmitterContext context)
{
InstSelR op = context.GetOp<InstSelR>();
Operand srcA = GetSrcReg(context, op.SrcA);
Operand srcB = GetSrcReg(context, op.SrcB);
Operand srcPred = GetPredicate(context, op.SrcPred, op.SrcPredInv);
EmitSel(context, srcA, srcB, srcPred, op.Dest);
}
public static void SelI(EmitterContext context)
{
InstSelI op = context.GetOp<InstSelI>();
Operand srcA = GetSrcReg(context, op.SrcA);
Operand srcB = GetSrcImm(context, Imm20ToSInt(op.Imm20));
Operand srcPred = GetPredicate(context, op.SrcPred, op.SrcPredInv);
EmitSel(context, srcA, srcB, srcPred, op.Dest);
}
public static void SelC(EmitterContext context)
{
InstSelC op = context.GetOp<InstSelC>();
Operand srcA = GetSrcReg(context, op.SrcA);
Operand srcB = GetSrcCbuf(context, op.CbufSlot, op.CbufOffset);
Operand srcPred = GetPredicate(context, op.SrcPred, op.SrcPredInv);
EmitSel(context, srcA, srcB, srcPred, op.Dest);
}
private static Operand EmitLoadSubgroupLaneId(EmitterContext context)
{
if (context.TranslatorContext.GpuAccessor.QueryHostSubgroupSize() <= 32)
@@ -215,37 +280,34 @@ namespace Ryujinx.Graphics.Shader.Instructions
}
}
public static void SelR(EmitterContext context)
private static void EmitPrmt(EmitterContext context, Operand op1, Operand control, Operand op2, PMode pMode, int rd)
{
InstSelR op = context.GetOp<InstSelR>();
if (pMode == PMode.Idx)
{
Operand res = Const(0);
Operand srcA = GetSrcReg(context, op.SrcA);
Operand srcB = GetSrcReg(context, op.SrcB);
Operand srcPred = GetPredicate(context, op.SrcPred, op.SrcPredInv);
for (int b = 0; b < 4; b++)
{
Operand sel = context.ShiftRightU32(control, Const(b * 4));
Operand byteSel = context.BitwiseAnd(sel, Const(7));
Operand copySign = context.BitwiseAnd(sel, Const(8));
EmitSel(context, srcA, srcB, srcPred, op.Dest);
}
Operand srcOp = context.ConditionalSelect(context.BitwiseAnd(byteSel, Const(4)), op2, op1);
Operand srcValue = context.ShiftRightU32(srcOp, context.ShiftLeft(context.BitwiseAnd(byteSel, Const(3)), Const(3)));
Operand srcSign = context.ShiftRightS32(context.ShiftLeft(srcValue, Const(24)), Const(31));
public static void SelI(EmitterContext context)
{
InstSelI op = context.GetOp<InstSelI>();
srcValue = context.ConditionalSelect(copySign, srcSign, srcValue);
srcValue = context.BitwiseAnd(srcValue, Const(0xff));
Operand srcA = GetSrcReg(context, op.SrcA);
Operand srcB = GetSrcImm(context, Imm20ToSInt(op.Imm20));
Operand srcPred = GetPredicate(context, op.SrcPred, op.SrcPredInv);
res = context.BitfieldInsert(res, srcValue, Const(b * 8), Const(8));
}
EmitSel(context, srcA, srcB, srcPred, op.Dest);
}
public static void SelC(EmitterContext context)
{
InstSelC op = context.GetOp<InstSelC>();
Operand srcA = GetSrcReg(context, op.SrcA);
Operand srcB = GetSrcCbuf(context, op.CbufSlot, op.CbufOffset);
Operand srcPred = GetPredicate(context, op.SrcPred, op.SrcPredInv);
EmitSel(context, srcA, srcB, srcPred, op.Dest);
context.Copy(GetDest(rd), res);
}
else
{
throw new NotImplementedException(pMode.ToString());
}
}
private static void EmitR2p(EmitterContext context, Operand value, Operand mask, ByteSel byteSel, bool ccpr)
src/Ryujinx.Graphics.Shader/IntermediateRepresentation/BasicBlock.cs
+1
View File
@@ -23,6 +23,7 @@ namespace Ryujinx.Graphics.Shader.IntermediateRepresentation
set => _branch = AddSuccessor(_branch, value);
}
public bool HasSuccessor => _branch != null || _next != null;
public bool HasBranch => _branch != null;
public bool Reachable => Index == 0 || Predecessors.Count != 0;
src/Ryujinx.Graphics.Shader/ShaderProgramInfo.cs
+3
View File
@@ -18,6 +18,7 @@ namespace Ryujinx.Graphics.Shader
public bool UsesInstanceId { get; }
public bool UsesDrawParameters { get; }
public bool UsesRtLayer { get; }
public bool HasUnconditionalDiscard { get; }
public byte ClipDistancesWritten { get; }
public int FragmentOutputMap { get; }
@@ -34,6 +35,7 @@ namespace Ryujinx.Graphics.Shader
bool usesInstanceId,
bool usesDrawParameters,
bool usesRtLayer,
bool hasUnconditionalDiscard,
byte clipDistancesWritten,
int fragmentOutputMap)
{
@@ -50,6 +52,7 @@ namespace Ryujinx.Graphics.Shader
UsesInstanceId = usesInstanceId;
UsesDrawParameters = usesDrawParameters;
UsesRtLayer = usesRtLayer;
HasUnconditionalDiscard = hasUnconditionalDiscard;
ClipDistancesWritten = clipDistancesWritten;
FragmentOutputMap = fragmentOutputMap;
}
src/Ryujinx.Graphics.Shader/SupportBuffer.cs
+10 -2
View File
@@ -24,6 +24,7 @@ namespace Ryujinx.Graphics.Shader
RenderScale,
TfeOffset,
TfeVertexCount,
BufferTextureOffset,
}
public struct SupportBuffer
@@ -42,10 +43,13 @@ namespace Ryujinx.Graphics.Shader
public static readonly int ComputeRenderScaleOffset;
public static readonly int TfeOffsetOffset;
public static readonly int TfeVertexCountOffset;
public static readonly int BufferTextureOffsetOffset;
public const int FragmentIsBgraCount = 8;
public const int TextureCount = 64;
// One for the render target, 64 for the textures, and 8 for the images.
public const int RenderScaleMaxCount = 1 + 64 + 8;
public const int RenderScaleMaxCount = 1 + TextureCount + 8;
private static int OffsetOf<T>(ref SupportBuffer storage, ref T target)
{
@@ -68,6 +72,7 @@ namespace Ryujinx.Graphics.Shader
ComputeRenderScaleOffset = GraphicsRenderScaleOffset + FieldSize;
TfeOffsetOffset = OffsetOf(ref instance, ref instance.TfeOffset);
TfeVertexCountOffset = OffsetOf(ref instance, ref instance.TfeVertexCount);
BufferTextureOffsetOffset = OffsetOf(ref instance, ref instance.BufferTextureOffset);
}
internal static StructureType GetStructureType()
@@ -80,7 +85,8 @@ namespace Ryujinx.Graphics.Shader
new StructureField(AggregateType.S32, "frag_scale_count"),
new StructureField(AggregateType.Array | AggregateType.FP32, "render_scale", RenderScaleMaxCount),
new StructureField(AggregateType.Vector4 | AggregateType.S32, "tfe_offset"),
new StructureField(AggregateType.S32, "tfe_vertex_count")
new StructureField(AggregateType.S32, "tfe_vertex_count"),
new StructureField(AggregateType.Array | AggregateType.Vector2 | AggregateType.S32, "buffer_texture_offset")
]);
}
@@ -95,5 +101,7 @@ namespace Ryujinx.Graphics.Shader
public Vector4<int> TfeOffset;
public Vector4<int> TfeVertexCount;
public Array5<Array64<Vector4<int>>> BufferTextureOffset;
}
}
src/Ryujinx.Graphics.Shader/Translation/FeatureFlags.cs
+1
View File
@@ -26,5 +26,6 @@ namespace Ryujinx.Graphics.Shader.Translation
SharedMemory = 1 << 11,
Store = 1 << 12,
VtgAsCompute = 1 << 13,
UnconditionalDiscard = 1 << 14,
}
}
src/Ryujinx.Graphics.Shader/Translation/FeatureIdentification.cs
+38
View File
@@ -0,0 +1,38 @@
using Ryujinx.Graphics.Shader.IntermediateRepresentation;
namespace Ryujinx.Graphics.Shader.Translation
{
static class FeatureIdentification
{
public static void RunPass(BasicBlock[] blocks, ShaderStage stage, ref FeatureFlags usedFeatures)
{
if (stage == ShaderStage.Fragment)
{
bool endsWithDiscardOnly = true;
for (int blockIndex = 0; blockIndex < blocks.Length; blockIndex++)
{
BasicBlock block = blocks[blockIndex];
if (block.HasSuccessor)
{
continue;
}
if (block.Operations.Count == 0 ||
block.Operations.Last.Value is not Operation operation ||
operation.Inst != Instruction.Discard)
{
endsWithDiscardOnly = false;
break;
}
}
if (endsWithDiscardOnly)
{
usedFeatures |= FeatureFlags.UnconditionalDiscard;
}
}
}
}
}
src/Ryujinx.Graphics.Shader/Translation/Optimizations/BindlessElimination.cs
+29 -106
View File
@@ -70,7 +70,19 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
Operand bindlessHandle = texOp.GetSource(0);
if (!IsBindlessAccessAllowed(bindlessHandle))
if (bindlessHandle.AsgOp is PhiNode phi)
{
for (int srcIndex = 0; srcIndex < phi.SourcesCount; srcIndex++)
{
Operand phiSource = phi.GetSource(srcIndex);
if (phiSource.AsgOp is not PhiNode && !IsBindlessAccessAllowed(phiSource))
{
return false;
}
}
}
else if (!IsBindlessAccessAllowed(bindlessHandle))
{
return false;
}
@@ -88,10 +100,7 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
texOp.SetSource(0, textureIndex);
// Buffer textures use a TIC/BufferView only and never consume a sampler.
// Avoiding a sampler descriptor array here is especially important for bindless
// texture buffers, where the array can span the entire sampler pool for no benefit.
bool hasSampler = !texOp.Inst.IsImage() && texOp.Type != SamplerType.TextureBuffer;
bool hasSampler = !texOp.Inst.IsImage();
SetBindingPair textureSetAndBinding = resourceManager.GetTextureOrImageBinding(
texOp.Inst,
@@ -134,112 +143,26 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
private static bool IsBindlessAccessAllowed(Operand bindlessHandle)
{
// Walk only SSA merges and integer operations that can transparently construct
// or select a packed texture/sampler handle. Do not walk arbitrary operations:
// finding an unrelated resource load elsewhere in the SSA graph must not enable
// descriptor-array access for this handle.
const int MaxVisitedOperands = 256;
const int MaxDepth = 64;
Stack<(Operand Operand, int Depth)> work = new();
HashSet<Operand> visited = new();
work.Push((bindlessHandle, 0));
while (work.Count != 0 && visited.Count < MaxVisitedOperands)
if (bindlessHandle.Type == OperandType.ConstantBuffer)
{
(Operand operand, int depth) = work.Pop();
// Bindless access with handles from constant buffer is allowed.
if (operand == null || depth > MaxDepth || !visited.Add(operand))
{
continue;
}
if (operand.Type == OperandType.ConstantBuffer)
{
// Constant buffers are accepted by the existing direct-handle path and
// remain accepted when SSA merges or integer handle arithmetic obscure them.
return true;
}
if (operand.AsgOp is PhiNode phi)
{
for (int index = 0; index < phi.SourcesCount; index++)
{
Operand source = phi.GetSource(index);
if (source.Type != OperandType.Undefined)
{
work.Push((source, depth + 1));
}
}
continue;
}
if (operand.AsgOp is not Operation operation)
{
continue;
}
Instruction inst = operation.Inst & Instruction.Mask;
if (inst == Instruction.Load)
{
// Preserve the performance restriction. Static CBUF operands are already
// accepted above; accept their dynamically indexed Load form as the same
// resource class, plus the existing shader-input and storage-buffer sources.
// Other loads remain traversal barriers and cannot authorize a pool array.
if (operation.StorageKind == StorageKind.ConstantBuffer ||
operation.StorageKind == StorageKind.Input ||
operation.StorageKind == StorageKind.StorageBuffer)
{
return true;
}
continue;
}
if (!IsHandleConstructionOperation(inst))
{
// Texture/image operations, arbitrary loads, floating-point conversions,
// calls and other unrelated calculations are deliberate traversal barriers.
continue;
}
for (int index = 0; index < operation.SourcesCount; index++)
{
work.Push((operation.GetSource(index), depth + 1));
}
return true;
}
return false;
}
if (bindlessHandle.AsgOp is not Operation handleOp ||
handleOp.Inst != Instruction.Load ||
(handleOp.StorageKind != StorageKind.Input && handleOp.StorageKind != StorageKind.StorageBuffer))
{
// Right now, we only allow bindless access when the handle comes from a shader input or storage buffer.
// This is an artificial limitation to prevent it from being used in cases where it
// would have a large performance impact of loading all textures in the pool.
// It might be removed in the future, if we can mitigate the performance impact.
private static bool IsHandleConstructionOperation(Instruction inst)
{
return inst is
Instruction.Add or
Instruction.Subtract or
Instruction.Multiply or
Instruction.MultiplyHighS32 or
Instruction.MultiplyHighU32 or
Instruction.BitwiseAnd or
Instruction.BitwiseExclusiveOr or
Instruction.BitwiseNot or
Instruction.BitwiseOr or
Instruction.BitfieldExtractS32 or
Instruction.BitfieldExtractU32 or
Instruction.BitfieldInsert or
Instruction.ShiftLeft or
Instruction.ShiftRightS32 or
Instruction.ShiftRightU32 or
Instruction.MinimumU32 or
Instruction.MaximumU32 or
Instruction.ClampU32 or
Instruction.ConditionalSelect or
Instruction.Copy or
Instruction.VectorExtract;
return false;
}
return true;
}
private static bool TryConvertBindless(BasicBlock block, ResourceManager resourceManager, IGpuAccessor gpuAccessor, TextureOperation texOp)
src/Ryujinx.Graphics.Shader/Translation/ResourceManager.cs
+104
View File
@@ -43,6 +43,11 @@ namespace Ryujinx.Graphics.Shader.Translation
private readonly Dictionary<TextureInfo, TextureMeta> _usedTextures;
private readonly Dictionary<TextureInfo, TextureMeta> _usedImages;
private readonly List<BufferDefinition> _vacConstantBuffers;
private readonly List<BufferDefinition> _vacStorageBuffers;
private readonly List<TextureDefinition> _vacTextures;
private readonly List<TextureDefinition> _vacImages;
public int LocalMemoryId { get; private set; }
public int SharedMemoryId { get; private set; }
@@ -78,6 +83,11 @@ namespace Ryujinx.Graphics.Shader.Translation
_usedTextures = new();
_usedImages = new();
_vacConstantBuffers = new();
_vacStorageBuffers = new();
_vacTextures = new();
_vacImages = new();
Properties.AddOrUpdateConstantBuffer(new(BufferLayout.Std140, 0, SupportBuffer.Binding, "support_buffer", SupportBuffer.GetStructureType()));
LocalMemoryId = -1;
@@ -563,6 +573,76 @@ namespace Ryujinx.Graphics.Shader.Translation
return descriptors.ToArray();
}
public ShaderProgramInfo GetVertexAsComputeInfo(bool isVertex = false)
{
var cbDescriptors = new BufferDescriptor[_vacConstantBuffers.Count];
int cbDescriptorIndex = 0;
foreach (BufferDefinition definition in _vacConstantBuffers)
{
cbDescriptors[cbDescriptorIndex++] = new BufferDescriptor(definition.Set, definition.Binding, 0, 0, 0, BufferUsageFlags.None);
}
var sbDescriptors = new BufferDescriptor[_vacStorageBuffers.Count];
int sbDescriptorIndex = 0;
foreach (BufferDefinition definition in _vacStorageBuffers)
{
sbDescriptors[sbDescriptorIndex++] = new BufferDescriptor(definition.Set, definition.Binding, 0, 0, 0, BufferUsageFlags.Write);
}
var tDescriptors = new TextureDescriptor[_vacTextures.Count];
int tDescriptorIndex = 0;
foreach (TextureDefinition definition in _vacTextures)
{
tDescriptors[tDescriptorIndex++] = new TextureDescriptor(
definition.Set,
definition.Binding,
definition.Type,
definition.Format,
0,
0,
definition.ArrayLength,
definition.Separate,
definition.Flags);
}
var iDescriptors = new TextureDescriptor[_vacImages.Count];
int iDescriptorIndex = 0;
foreach (TextureDefinition definition in _vacImages)
{
iDescriptors[iDescriptorIndex++] = new TextureDescriptor(
definition.Set,
definition.Binding,
definition.Type,
definition.Format,
0,
0,
definition.ArrayLength,
definition.Separate,
definition.Flags);
}
return new ShaderProgramInfo(
cbDescriptors,
sbDescriptors,
tDescriptors,
iDescriptors,
isVertex ? ShaderStage.Vertex : ShaderStage.Compute,
0,
0,
0,
false,
false,
false,
false,
false,
0,
0);
}
public bool TryGetCbufSlotAndHandleForTexture(int binding, out int cbufSlot, out int handle)
{
foreach ((TextureInfo info, TextureMeta meta) in _usedTextures)
@@ -627,6 +707,30 @@ namespace Ryujinx.Graphics.Shader.Translation
Properties.AddOrUpdateStorageBuffer(new(BufferLayout.Std430, setIndex, binding, name, type));
}
public void AddVertexAsComputeConstantBuffer(BufferDefinition definition)
{
_vacConstantBuffers.Add(definition);
Properties.AddOrUpdateConstantBuffer(definition);
}
public void AddVertexAsComputeStorageBuffer(BufferDefinition definition)
{
_vacStorageBuffers.Add(definition);
Properties.AddOrUpdateStorageBuffer(definition);
}
public void AddVertexAsComputeTexture(TextureDefinition definition)
{
_vacTextures.Add(definition);
Properties.AddOrUpdateTexture(definition);
}
public void AddVertexAsComputeImage(TextureDefinition definition)
{
_vacImages.Add(definition);
Properties.AddOrUpdateImage(definition);
}
public static string GetShaderStagePrefix(ShaderStage stage)
{
uint index = (uint)stage;
src/Ryujinx.Graphics.Shader/Translation/Transforms/TexturePass.cs
+95 -1
View File
@@ -1,4 +1,5 @@
using Ryujinx.Graphics.Shader.IntermediateRepresentation;
using Ryujinx.Graphics.Shader.Translation.Optimizations;
using System.Collections.Generic;
using System.Linq;
using static Ryujinx.Graphics.Shader.IntermediateRepresentation.OperandHelper;
@@ -27,7 +28,19 @@ namespace Ryujinx.Graphics.Shader.Translation.Transforms
if (texOp.Type == SamplerType.TextureBuffer && !context.GpuAccessor.QueryHostSupportsSnormBufferTextureFormat())
{
node = InsertSnormNormalization(node, context.ResourceManager, context.GpuAccessor);
if (!context.GpuAccessor.QueryHostSupportsSnormBufferTextureFormat())
{
node = InsertSnormNormalization(node, context.ResourceManager, context.GpuAccessor);
}
if (!context.GpuAccessor.QueryHostSupportsBufferTexturePixelAlignment())
{
node = InsertCoordOffset(node, context.ResourceManager, context.Stage, isImage: false);
}
}
else if (!context.GpuAccessor.QueryHostSupportsBufferTexturePixelAlignment() && texOp.Inst.IsImage())
{
node = InsertCoordOffset(node, context.ResourceManager, context.Stage, isImage: true);
}
}
}
@@ -278,6 +291,87 @@ namespace Ryujinx.Graphics.Shader.Translation.Transforms
return node;
}
private static LinkedListNode<INode> InsertCoordOffset(LinkedListNode<INode> node, ResourceManager resourceManager, ShaderStage stage, bool isImage)
{
// Some GPUs have fixed alignment requirements for buffer textures.
// For those cases, we bind the aligned buffer offset, and apply the remaining offset on the shader.
TextureOperation texOp = (TextureOperation)node.Value;
if ((texOp.Type & SamplerType.Mask) != SamplerType.TextureBuffer)
{
return node;
}
Operand[] sources = new Operand[texOp.SourcesCount];
for (int i = 0; i < texOp.SourcesCount; i++)
{
sources[i] = texOp.GetSource(i);
}
bool isBindless = (texOp.Flags & TextureFlags.Bindless) != 0;
bool isIndexed = resourceManager.IsArrayOfTexturesOrImages(texOp.Binding, isImage);
int coordsIndex = isBindless || isIndexed ? 1 : 0;
Operand[] dests = new Operand[texOp.DestsCount];
for (int i = 0; i < texOp.DestsCount; i++)
{
dests[i] = texOp.GetDest(i);
}
LinkedListNode<INode> oldNode = node;
Operand source = sources[coordsIndex];
Operand offset = Local();
Operand coordPlusOffset = Local();
int stageIndex = stage switch
{
ShaderStage.TessellationControl => 1,
ShaderStage.TessellationEvaluation => 2,
ShaderStage.Geometry => 3,
ShaderStage.Fragment => 4,
_ => 0,
};
int bindingIndex = isImage
? resourceManager.FindImageDescriptorIndex(texOp.Binding)
: resourceManager.FindTextureDescriptorIndex(texOp.Binding);
node.List.AddBefore(node, new Operation(
Instruction.Load,
StorageKind.ConstantBuffer,
offset,
Const(SupportBuffer.Binding),
Const((int)SupportBufferField.BufferTextureOffset),
Const(stageIndex * SupportBuffer.TextureCount + bindingIndex),
Const(isImage ? 1 : 0)));
node.List.AddBefore(node, new Operation(Instruction.Add, coordPlusOffset, source, offset));
sources[coordsIndex] = coordPlusOffset;
TextureOperation newTexOp = new(
texOp.Inst,
texOp.Type,
texOp.Format,
texOp.Flags,
texOp.Set,
texOp.Binding,
texOp.Index,
dests,
sources);
node = node.List.AddBefore(node, newTexOp);
Utils.DeleteNode(oldNode, texOp);
return node;
}
private static LinkedListNode<INode> InsertConstOffsets(LinkedListNode<INode> node, ResourceManager resourceManager, IGpuAccessor gpuAccessor, ShaderStage stage)
{
// Non-constant texture offsets are not allowed (according to the spec),
src/Ryujinx.Graphics.Shader/Translation/TranslatorContext.cs
+24 -13
View File
@@ -301,6 +301,11 @@ namespace Ryujinx.Graphics.Shader.Translation
Optimizer.RunPass(context);
TransformPasses.RunPass(context);
if (i == 0)
{
FeatureIdentification.RunPass(cfg.Blocks, Definitions.Stage, ref usedFeatures);
}
}
funcs[i] = new Function(cfg.Blocks, $"fun{i}", false, inArgumentsCount, outArgumentsCount);
@@ -353,6 +358,7 @@ namespace Ryujinx.Graphics.Shader.Translation
usedFeatures.HasFlag(FeatureFlags.InstanceId),
usedFeatures.HasFlag(FeatureFlags.DrawParameters),
usedFeatures.HasFlag(FeatureFlags.RtLayer),
usedFeatures.HasFlag(FeatureFlags.UnconditionalDiscard),
clipDistancesWritten,
originalDefinitions.OmapTargets);
@@ -393,7 +399,7 @@ namespace Ryujinx.Graphics.Shader.Translation
{
int binding = resourceManager.Reservations.GetTfeBufferStorageBufferBinding(i);
BufferDefinition tfeDataBuffer = new(BufferLayout.Std430, 1, binding, $"tfe_data{i}", tfeDataStruct);
resourceManager.Properties.AddOrUpdateStorageBuffer(tfeDataBuffer);
resourceManager.AddVertexAsComputeStorageBuffer(tfeDataBuffer);
}
}
@@ -401,7 +407,7 @@ namespace Ryujinx.Graphics.Shader.Translation
{
int vertexInfoCbBinding = resourceManager.Reservations.VertexInfoConstantBufferBinding;
BufferDefinition vertexInfoBuffer = new(BufferLayout.Std140, 0, vertexInfoCbBinding, "vb_info", VertexInfoBuffer.GetStructureType());
resourceManager.Properties.AddOrUpdateConstantBuffer(vertexInfoBuffer);
resourceManager.AddVertexAsComputeConstantBuffer(vertexInfoBuffer);
StructureType vertexOutputStruct = new([
new StructureField(AggregateType.Array | AggregateType.FP32, "data", 0)
@@ -409,13 +415,13 @@ namespace Ryujinx.Graphics.Shader.Translation
int vertexOutputSbBinding = resourceManager.Reservations.VertexOutputStorageBufferBinding;
BufferDefinition vertexOutputBuffer = new(BufferLayout.Std430, 1, vertexOutputSbBinding, "vertex_output", vertexOutputStruct);
resourceManager.Properties.AddOrUpdateStorageBuffer(vertexOutputBuffer);
resourceManager.AddVertexAsComputeStorageBuffer(vertexOutputBuffer);
if (Stage == ShaderStage.Vertex)
{
SetBindingPair ibSetAndBinding = resourceManager.Reservations.GetIndexBufferTextureSetAndBinding();
TextureDefinition indexBuffer = new(ibSetAndBinding.SetIndex, ibSetAndBinding.Binding, "ib_data", SamplerType.TextureBuffer);
resourceManager.Properties.AddOrUpdateTexture(indexBuffer);
resourceManager.AddVertexAsComputeTexture(indexBuffer);
int inputMap = _program.AttributeUsage.UsedInputAttributes;
@@ -424,7 +430,7 @@ namespace Ryujinx.Graphics.Shader.Translation
int location = BitOperations.TrailingZeroCount(inputMap);
SetBindingPair setAndBinding = resourceManager.Reservations.GetVertexBufferTextureSetAndBinding(location);
TextureDefinition vaBuffer = new(setAndBinding.SetIndex, setAndBinding.Binding, $"vb_data{location}", SamplerType.TextureBuffer);
resourceManager.Properties.AddOrUpdateTexture(vaBuffer);
resourceManager.AddVertexAsComputeTexture(vaBuffer);
inputMap &= ~(1 << location);
}
@@ -433,11 +439,11 @@ namespace Ryujinx.Graphics.Shader.Translation
{
SetBindingPair trbSetAndBinding = resourceManager.Reservations.GetTopologyRemapBufferTextureSetAndBinding();
TextureDefinition remapBuffer = new(trbSetAndBinding.SetIndex, trbSetAndBinding.Binding, "trb_data", SamplerType.TextureBuffer);
resourceManager.Properties.AddOrUpdateTexture(remapBuffer);
resourceManager.AddVertexAsComputeTexture(remapBuffer);
int geometryVbOutputSbBinding = resourceManager.Reservations.GeometryVertexOutputStorageBufferBinding;
BufferDefinition geometryVbOutputBuffer = new(BufferLayout.Std430, 1, geometryVbOutputSbBinding, "geometry_vb_output", vertexOutputStruct);
resourceManager.Properties.AddOrUpdateStorageBuffer(geometryVbOutputBuffer);
resourceManager.AddVertexAsComputeStorageBuffer(geometryVbOutputBuffer);
StructureType geometryIbOutputStruct = new([
new StructureField(AggregateType.Array | AggregateType.U32, "data", 0)
@@ -445,7 +451,7 @@ namespace Ryujinx.Graphics.Shader.Translation
int geometryIbOutputSbBinding = resourceManager.Reservations.GeometryIndexOutputStorageBufferBinding;
BufferDefinition geometryIbOutputBuffer = new(BufferLayout.Std430, 1, geometryIbOutputSbBinding, "geometry_ib_output", geometryIbOutputStruct);
resourceManager.Properties.AddOrUpdateStorageBuffer(geometryIbOutputBuffer);
resourceManager.AddVertexAsComputeStorageBuffer(geometryIbOutputBuffer);
}
resourceManager.SetVertexAsComputeLocalMemories(Definitions.Stage, Definitions.InputTopology);
@@ -478,12 +484,17 @@ namespace Ryujinx.Graphics.Shader.Translation
return new ResourceReservations(GpuAccessor, IsTransformFeedbackEmulated, vertexAsCompute: true, _vertexOutput, ioUsage);
}
public ShaderProgramInfo GetVertexAsComputeInfo()
{
return CreateResourceManager(true).GetVertexAsComputeInfo();
}
public void SetVertexOutputMapForGeometryAsCompute(TranslatorContext vertexContext)
{
_vertexOutput = vertexContext._program.GetIoUsage();
}
public ShaderProgram GenerateVertexPassthroughForCompute()
public (ShaderProgram, ShaderProgramInfo) GenerateVertexPassthroughForCompute()
{
AttributeUsage attributeUsage = new(GpuAccessor);
ResourceManager resourceManager = new(ShaderStage.Vertex, GpuAccessor);
@@ -495,7 +506,7 @@ namespace Ryujinx.Graphics.Shader.Translation
if (Stage == ShaderStage.Vertex)
{
BufferDefinition vertexInfoBuffer = new(BufferLayout.Std140, 0, vertexInfoCbBinding, "vb_info", VertexInfoBuffer.GetStructureType());
resourceManager.Properties.AddOrUpdateConstantBuffer(vertexInfoBuffer);
resourceManager.AddVertexAsComputeConstantBuffer(vertexInfoBuffer);
}
StructureType vertexInputStruct = new([
@@ -504,7 +515,7 @@ namespace Ryujinx.Graphics.Shader.Translation
int vertexDataSbBinding = reservations.VertexOutputStorageBufferBinding;
BufferDefinition vertexOutputBuffer = new(BufferLayout.Std430, 1, vertexDataSbBinding, "vb_input", vertexInputStruct);
resourceManager.Properties.AddOrUpdateStorageBuffer(vertexOutputBuffer);
resourceManager.AddVertexAsComputeStorageBuffer(vertexOutputBuffer);
EmitterContext context = new();
@@ -562,14 +573,14 @@ namespace Ryujinx.Graphics.Shader.Translation
LastInVertexPipeline = true
};
return Generate(
return (Generate(
[function],
attributeUsage,
definitions,
definitions,
resourceManager,
FeatureFlags.None,
0);
0), resourceManager.GetVertexAsComputeInfo(isVertex: true));
}
public ShaderProgram GenerateGeometryPassthrough()
src/Ryujinx.Graphics.Vulkan/BackgroundResources.cs
+1
View File
@@ -36,6 +36,7 @@ namespace Ryujinx.Graphics.Vulkan
queueLock,
_gd.QueueFamilyIndex,
_gd.IsQualcommProprietary,
_gd.IsTurnip,
isLight: true);
}
}
src/Ryujinx.Graphics.Vulkan/CommandBufferPool.cs
+5 -2
View File
@@ -19,6 +19,7 @@ namespace Ryujinx.Graphics.Vulkan
private readonly Queue _queue;
private readonly Lock _queueLock;
private readonly bool _concurrentFenceWaitUnsupported;
private readonly bool _fenceAlwaysWaits;
private readonly CommandPool _pool;
private readonly Thread _owner;
@@ -66,6 +67,7 @@ namespace Ryujinx.Graphics.Vulkan
Lock queueLock,
uint queueFamilyIndex,
bool concurrentFenceWaitUnsupported,
bool fenceAlwaysWaits,
bool isLight = false)
{
_api = api;
@@ -73,6 +75,7 @@ namespace Ryujinx.Graphics.Vulkan
_queue = queue;
_queueLock = queueLock;
_concurrentFenceWaitUnsupported = concurrentFenceWaitUnsupported;
_fenceAlwaysWaits = fenceAlwaysWaits;
_owner = Thread.CurrentThread;
CommandPoolCreateInfo commandPoolCreateInfo = new()
@@ -207,7 +210,7 @@ namespace Ryujinx.Graphics.Vulkan
ref ReservedCommandBuffer entry = ref _commandBuffers[index];
if (wait || !entry.InConsumption || entry.Fence.IsSignaled())
if (wait || !entry.InConsumption || entry.Fence.IsSignaledLazy())
{
WaitAndDecrementRef(index);
@@ -349,7 +352,7 @@ namespace Ryujinx.Graphics.Vulkan
if (refreshFence)
{
entry.Fence = new FenceHolder(_api, _device, _concurrentFenceWaitUnsupported);
entry.Fence = new FenceHolder(_api, _device, _concurrentFenceWaitUnsupported, _fenceAlwaysWaits);
}
else
{
src/Ryujinx.Graphics.Vulkan/FenceHolder.cs
+13 -1
View File
@@ -12,13 +12,15 @@ namespace Ryujinx.Graphics.Vulkan
private int _referenceCount;
private int _lock;
private readonly bool _concurrentWaitUnsupported;
private readonly bool _alwaysWaits;
private bool _disposed;
public unsafe FenceHolder(Vk api, Device device, bool concurrentWaitUnsupported)
public unsafe FenceHolder(Vk api, Device device, bool concurrentWaitUnsupported, bool alwaysWaits)
{
_api = api;
_device = device;
_concurrentWaitUnsupported = concurrentWaitUnsupported;
_alwaysWaits = alwaysWaits;
FenceCreateInfo fenceCreateInfo = new()
{
@@ -123,6 +125,16 @@ namespace Ryujinx.Graphics.Vulkan
}
}
public bool IsSignaledLazy()
{
if (_alwaysWaits)
{
return false;
}
return IsSignaled();
}
public bool IsSignaled()
{
if (_concurrentWaitUnsupported)
src/Ryujinx.Graphics.Vulkan/FramebufferParams.cs
-23
View File
@@ -32,29 +32,6 @@ namespace Ryujinx.Graphics.Vulkan
public bool HasDepthStencil { get; private set; }
public int ColorAttachmentsCount => AttachmentsCount - (HasDepthStencil ? 1 : 0);
public bool SetVirtualSize(uint width, uint height, uint layers)
{
if (AttachmentsCount != 0)
{
return false;
}
width = Math.Max(1u, width);
height = Math.Max(1u, height);
layers = Math.Max(1u, layers);
if (Width == width && Height == height && Layers == layers)
{
return false;
}
Width = width;
Height = height;
Layers = layers;
return true;
}
public FramebufferParams(Device device, TextureView view, uint width, uint height)
{
Format format = view.Info.Format;
src/Ryujinx.Graphics.Vulkan/HelperShader.cs
+4 -4
View File
@@ -406,10 +406,10 @@ namespace Ryujinx.Graphics.Vulkan
if (dstIsDepthOrStencil)
{
_pipeline.SetProgram(src.Info.Target.IsMultisample ? _programDepthBlitMs : _programDepthBlit);
_pipeline.SetProgram(src.Info.Target.IsMultisample() ? _programDepthBlitMs : _programDepthBlit);
_pipeline.SetDepthTest(new DepthTestDescriptor(true, true, CompareOp.Always));
}
else if (src.Info.Target.IsMultisample)
else if (src.Info.Target.IsMultisample())
{
_pipeline.SetProgram(_programColorBlitMs);
}
@@ -566,12 +566,12 @@ namespace Ryujinx.Graphics.Vulkan
if (isDepth)
{
_pipeline.SetProgram(src.Info.Target.IsMultisample ? _programDepthBlitMs : _programDepthBlit);
_pipeline.SetProgram(src.Info.Target.IsMultisample() ? _programDepthBlitMs : _programDepthBlit);
_pipeline.SetDepthTest(new DepthTestDescriptor(true, true, CompareOp.Always));
}
else
{
_pipeline.SetProgram(src.Info.Target.IsMultisample ? _programStencilBlitMs : _programStencilBlit);
_pipeline.SetProgram(src.Info.Target.IsMultisample() ? _programStencilBlitMs : _programStencilBlit);
_pipeline.SetStencilTest(CreateStencilTestDescriptor(true));
}
src/Ryujinx.Graphics.Vulkan/Helpers.cs
-32
View File
@@ -1,32 +0,0 @@
using Silk.NET.Vulkan;
using System.Runtime.CompilerServices;
namespace Ryujinx.Graphics.Vulkan
{
public static class Helpers
{
extension(Vk api)
{
/// <summary>
/// C# implementation of the RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE macro from the RenderDoc API header, since we cannot use macros from C#.
/// </summary>
/// <returns>The dispatch table pointer, which sits as the first pointer-sized object in the memory pointed to by the <see cref="Vk"/>'s <see cref="Instance"/> pointer.</returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public unsafe void* GetRenderDocDevicePointer() =>
api.CurrentInstance is not null
? api.CurrentInstance.Value.GetRenderDocDevicePointer()
: null;
}
extension(Instance instance)
{
/// <summary>
/// C# implementation of the RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE macro from the RenderDoc API header, since we cannot use macros from C#.
/// </summary>
/// <returns>The dispatch table pointer, which sits as the first pointer-sized object in the memory pointed to by the <see cref="Instance"/>'s pointer.</returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public unsafe void* GetRenderDocDevicePointer()
=> (*((void**)(instance.Handle)));
}
}
}
src/Ryujinx.Graphics.Vulkan/MoltenVK/MVKConfiguration.cs
+104
View File
@@ -0,0 +1,104 @@
using System;
using System.Runtime.InteropServices;
namespace Ryujinx.Graphics.Vulkan.MoltenVK
{
enum MVKConfigLogLevel
{
None = 0,
Error = 1,
Warning = 2,
Info = 3,
Debug = 4,
}
enum MVKConfigTraceVulkanCalls
{
None = 0,
Enter = 1,
EnterExit = 2,
Duration = 3,
}
enum MVKConfigAutoGPUCaptureScope
{
None = 0,
Device = 1,
Frame = 2,
}
[Flags]
enum MVKConfigAdvertiseExtensions
{
All = 0x00000001,
MoltenVK = 0x00000002,
WSI = 0x00000004,
Portability = 0x00000008,
}
enum MVKVkSemaphoreSupportStyle
{
MVK_CONFIG_VK_SEMAPHORE_SUPPORT_STYLE_SINGLE_QUEUE = 0,
MVK_CONFIG_VK_SEMAPHORE_SUPPORT_STYLE_METAL_EVENTS_WHERE_SAFE = 1,
MVK_CONFIG_VK_SEMAPHORE_SUPPORT_STYLE_METAL_EVENTS = 2,
MVK_CONFIG_VK_SEMAPHORE_SUPPORT_STYLE_CALLBACK = 3,
MVK_CONFIG_VK_SEMAPHORE_SUPPORT_STYLE_MAX_ENUM = 0x7FFFFFFF,
}
readonly struct Bool32
{
uint Value { get; }
public Bool32(uint value)
{
Value = value;
}
public Bool32(bool value)
{
Value = value ? 1u : 0u;
}
public static implicit operator bool(Bool32 val) => val.Value == 1;
public static implicit operator Bool32(bool val) => new(val);
}
[StructLayout(LayoutKind.Sequential)]
struct MVKConfiguration
{
public Bool32 DebugMode;
public Bool32 ShaderConversionFlipVertexY;
public Bool32 SynchronousQueueSubmits;
public Bool32 PrefillMetalCommandBuffers;
public uint MaxActiveMetalCommandBuffersPerQueue;
public Bool32 SupportLargeQueryPools;
public Bool32 PresentWithCommandBuffer;
public Bool32 SwapchainMagFilterUseNearest;
public ulong MetalCompileTimeout;
public Bool32 PerformanceTracking;
public uint PerformanceLoggingFrameCount;
public Bool32 DisplayWatermark;
public Bool32 SpecializedQueueFamilies;
public Bool32 SwitchSystemGPU;
public Bool32 FullImageViewSwizzle;
public uint DefaultGPUCaptureScopeQueueFamilyIndex;
public uint DefaultGPUCaptureScopeQueueIndex;
public Bool32 FastMathEnabled;
public MVKConfigLogLevel LogLevel;
public MVKConfigTraceVulkanCalls TraceVulkanCalls;
public Bool32 ForceLowPowerGPU;
public Bool32 SemaphoreUseMTLFence;
public MVKVkSemaphoreSupportStyle SemaphoreSupportStyle;
public MVKConfigAutoGPUCaptureScope AutoGPUCaptureScope;
public nint AutoGPUCaptureOutputFilepath;
public Bool32 Texture1DAs2D;
public Bool32 PreallocateDescriptors;
public Bool32 UseCommandPooling;
public Bool32 UseMTLHeap;
public Bool32 LogActivityPerformanceInline;
public uint ApiVersionToAdvertise;
public MVKConfigAdvertiseExtensions AdvertiseExtensions;
public Bool32 ResumeLostDevice;
public Bool32 UseMetalArgumentBuffers;
}
}
src/Ryujinx.Graphics.Vulkan/MoltenVK/MVKInitialization.cs
+51
View File
@@ -0,0 +1,51 @@
using Silk.NET.Core.Loader;
using Silk.NET.Vulkan;
using System;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;
namespace Ryujinx.Graphics.Vulkan.MoltenVK
{
[SupportedOSPlatform("macos")]
public static partial class MVKInitialization
{
private const string VulkanLib = "libvulkan.dylib";
[LibraryImport("libMoltenVK.dylib")]
private static partial Result vkGetMoltenVKConfigurationMVK(nint unusedInstance, out MVKConfiguration config, in nint configSize);
[LibraryImport("libMoltenVK.dylib")]
private static partial Result vkSetMoltenVKConfigurationMVK(nint unusedInstance, in MVKConfiguration config, in nint configSize);
public static void Initialize()
{
IntPtr configSize = (nint)Marshal.SizeOf<MVKConfiguration>();
vkGetMoltenVKConfigurationMVK(nint.Zero, out MVKConfiguration config, configSize);
config.UseMetalArgumentBuffers = true;
config.SemaphoreSupportStyle = MVKVkSemaphoreSupportStyle.MVK_CONFIG_VK_SEMAPHORE_SUPPORT_STYLE_SINGLE_QUEUE;
config.SynchronousQueueSubmits = false;
config.ResumeLostDevice = true;
vkSetMoltenVKConfigurationMVK(nint.Zero, config, configSize);
}
private static string[] Resolver(string path)
{
if (path.EndsWith(VulkanLib))
{
path = path[..^VulkanLib.Length] + "libMoltenVK.dylib";
return [path];
}
return [];
}
public static void InitializeResolver()
{
((DefaultPathResolver)PathResolver.Default).Resolvers.Insert(0, Resolver);
}
}
}
src/Ryujinx.Graphics.Vulkan/PipelineBase.cs
-23
View File
@@ -843,11 +843,6 @@ namespace Ryujinx.Graphics.Vulkan
public void SetImage(ShaderStage stage, int binding, ITexture image)
{
_descriptorSetUpdater.SetImage(Cbs, stage, binding, image);
if (stage == ShaderStage.Fragment && image is TextureView view)
{
FramebufferParams?.SetVirtualSize((uint)view.Width, (uint)view.Height, (uint)view.Layers);
}
}
public void SetImage(int binding, Auto<DisposableImageView> image)
@@ -1612,24 +1607,6 @@ namespace Ryujinx.Graphics.Vulkan
private bool RecreateGraphicsPipelineIfNeeded()
{
if (FramebufferParams != null &&
FramebufferParams.AttachmentsCount == 0 &&
FramebufferParams.Width == 1 &&
FramebufferParams.Height == 1 &&
DynamicState.ViewportsCount != 0)
{
// An attachmentless fragment pass can reach its first draw before the storage
// image descriptor is rebound. At that point the null framebuffer still has
// its constructor fallback of 1x1, even though the guest viewport already
// describes the real render area. Seed the virtual framebuffer from that
// viewport so the first storage-image draw is not clipped to one pixel.
Silk.NET.Vulkan.Viewport viewport = DynamicState.Viewports[0];
uint width = (uint)Math.Max(1f, Math.Abs(viewport.Width));
uint height = (uint)Math.Max(1f, Math.Abs(viewport.Height));
FramebufferParams.SetVirtualSize(width, height, 1);
}
if (AutoFlush.ShouldFlushDraw(DrawCount))
{
Gd.FlushAllCommands();
src/Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj
-1
View File
@@ -44,7 +44,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Ryujinx.SPB" />
<PackageReference Include="Silk.NET.Shaderc" ExcludeAssets="native" />
<PackageReference Include="Silk.NET.Vulkan" />
<PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" />
src/Ryujinx.Graphics.Vulkan/ShaderCollection.cs
+23 -6
View File
@@ -60,7 +60,7 @@ namespace Ryujinx.Graphics.Vulkan
private ProgramPipelineState _state;
private DisposableRenderPass _dummyRenderPass;
private readonly Task _compileTask;
private ShaderCompilationRequest _compileRequest;
private bool _firstBackgroundUse;
public ShaderCollection(
@@ -139,7 +139,7 @@ namespace Ryujinx.Graphics.Vulkan
// Updating buffer texture bindings using template updates crashes the Adreno driver on Windows.
UpdateTexturesWithoutTemplate = gd.IsQualcommProprietary && usesBufferTextures;
_compileTask = Task.CompletedTask;
_compileRequest = new ShaderCompilationRequest(Task.CompletedTask);
_firstBackgroundUse = false;
}
@@ -153,7 +153,9 @@ namespace Ryujinx.Graphics.Vulkan
{
_state = state;
_compileTask = BackgroundCompilation();
_compileRequest = gd.ShaderCompilationQueue != null
? gd.ShaderCompilationQueue.Add(BackgroundCompilation)
: new ShaderCompilationRequest(BackgroundCompilationAsync());
_firstBackgroundUse = !fromCache;
}
@@ -458,10 +460,25 @@ namespace Ryujinx.Graphics.Vulkan
return (buffer, texture);
}
private async Task BackgroundCompilation()
private async Task BackgroundCompilationAsync()
{
await Task.WhenAll(_shaders.Select(shader => shader.CompileTask));
BackgroundCompilationImpl();
}
private void BackgroundCompilation()
{
foreach (var shader in _shaders)
{
shader.CompileTask.Wait();
}
BackgroundCompilationImpl();
}
private void BackgroundCompilationImpl()
{
if (Array.Exists(_shaders, shader => shader.CompileStatus == ProgramLinkStatus.Failure))
{
LinkStatus = ProgramLinkStatus.Failure;
@@ -604,11 +621,11 @@ namespace Ryujinx.Graphics.Vulkan
}
}
if (!_compileTask.IsCompleted)
if (!_compileRequest.IsCompleted)
{
if (blocking)
{
_compileTask.Wait();
_compileRequest.Wait();
if (LinkStatus == ProgramLinkStatus.Failure)
{
src/Ryujinx.Graphics.Vulkan/ShaderCompilationQueue.cs
+131
View File
@@ -0,0 +1,131 @@
using System;
using System.Collections.Concurrent;
using System.Threading;
namespace Ryujinx.Graphics.Vulkan
{
class ShaderCompilationQueue
{
private const int MaxParallelCompilations = 8;
private const int MaxThreadStackSize = 2 * 1024 * 1024; // MB
private struct Request
{
public readonly ulong Id;
public readonly Action Callback;
public Request(ulong id, Action callback)
{
Id = id;
Callback = callback;
}
}
private readonly Thread[] _workerThreads;
private readonly CancellationTokenSource _cts;
private readonly BlockingCollection<Request>[] _queues;
private readonly ulong[] _finishedIds;
private ulong _currentId;
private int _currentQueueIndex;
public ShaderCompilationQueue()
{
_workerThreads = new Thread[MaxParallelCompilations];
_queues = new BlockingCollection<Request>[MaxParallelCompilations];
_finishedIds = new ulong[MaxParallelCompilations];
_cts = new CancellationTokenSource();
for (int i = 0; i < MaxParallelCompilations; i++)
{
_queues[i] = new BlockingCollection<Request>();
Thread thread = new Thread(DoWork, MaxThreadStackSize) { Name = $"BackgroundShaderCompiler.{i}" };
thread.IsBackground = true;
thread.Start(i);
_workerThreads[i] = thread;
}
}
private void DoWork(object threadId)
{
int queueIndex = (int)threadId;
try
{
var queue = _queues[queueIndex];
foreach (var request in queue.GetConsumingEnumerable(_cts.Token))
{
request.Callback();
lock (queue)
{
_finishedIds[queueIndex] = request.Id;
Monitor.PulseAll(queue);
}
}
}
catch (OperationCanceledException)
{
}
}
public ShaderCompilationRequest Add(Action callback)
{
ulong newId = Interlocked.Increment(ref _currentId);
// Let's keep rotating between the queues to increase the chances
// that the selected queue thread is currently idle.
int queueIndex = Interlocked.Increment(ref _currentQueueIndex) % MaxParallelCompilations;
_queues[queueIndex].Add(new Request(newId, callback));
return new ShaderCompilationRequest(this, queueIndex, newId);
}
public void Wait(int queueIndex, ulong id)
{
var queue = _queues[queueIndex];
lock (queue)
{
while (_finishedIds[queueIndex] < id)
{
Monitor.Wait(queue);
}
}
}
public bool IsCompleted(int queueIndex, ulong id)
{
var queue = _queues[queueIndex];
lock (queue)
{
return _finishedIds[queueIndex] >= id;
}
}
public void Dispose()
{
for (int i = 0; i < MaxParallelCompilations; i++)
{
_queues[i].CompleteAdding();
}
_cts.Cancel();
for (int i = 0; i < MaxParallelCompilations; i++)
{
_workerThreads[i].Join();
_queues[i].Dispose();
}
_cts.Dispose();
}
}
}
src/Ryujinx.Graphics.Vulkan/ShaderCompilationRequest.cs
+55
View File
@@ -0,0 +1,55 @@
using System.Threading.Tasks;
namespace Ryujinx.Graphics.Vulkan
{
struct ShaderCompilationRequest
{
private readonly Task _task;
private readonly ShaderCompilationQueue _queue;
private readonly int _queueIndex;
private readonly ulong _requestId;
public bool IsCompleted
{
get
{
if (_task != null)
{
return _task.IsCompleted;
}
else
{
return _queue.IsCompleted(_queueIndex, _requestId);
}
}
}
public ShaderCompilationRequest(Task task)
{
_task = task;
_queue = null;
_queueIndex = 0;
_requestId = 0;
}
public ShaderCompilationRequest(ShaderCompilationQueue queue, int queueIndex, ulong requestId)
{
_task = null;
_queue = queue;
_queueIndex = queueIndex;
_requestId = requestId;
}
public void Wait()
{
if (_task != null)
{
_task.Wait();
}
else
{
_queue.Wait(_queueIndex, _requestId);
}
}
}
}
src/Ryujinx.Graphics.Vulkan/StagingBuffer.cs
+1 -1
View File
@@ -266,7 +266,7 @@ namespace Ryujinx.Graphics.Vulkan
public void FreeCompleted()
{
FenceHolder signalledFence = null;
while (_pendingCopies.TryPeek(out PendingCopy pc) && pc.Fence != null && (pc.Fence == signalledFence || pc.Fence.IsSignaled()))
while (_pendingCopies.TryPeek(out PendingCopy pc) && pc.Fence != null && (pc.Fence == signalledFence || pc.Fence.IsSignaledLazy()))
{
signalledFence = pc.Fence; // Already checked - don't need to do it again.
PendingCopy dequeued = _pendingCopies.Dequeue();
src/Ryujinx.Graphics.Vulkan/TextureStorage.cs
+2 -2
View File
@@ -79,7 +79,7 @@ namespace Ryujinx.Graphics.Vulkan
_device = device;
_info = info;
bool isMsImageStorageSupported = gd.Capabilities.SupportsShaderStorageImageMultisample || !info.Target.IsMultisample;
bool isMsImageStorageSupported = gd.Capabilities.SupportsShaderStorageImageMultisample || !info.Target.IsMultisample();
VkFormat format = _gd.FormatCapabilities.ConvertToVkFormat(info.Format, isMsImageStorageSupported);
uint levels = (uint)info.Levels;
@@ -323,7 +323,7 @@ namespace Ryujinx.Graphics.Vulkan
usage |= ImageUsageFlags.ColorAttachmentBit;
}
if (format.IsImageCompatible() && (isMsImageStorageSupported || !target.IsMultisample))
if (format.IsImageCompatible() && (isMsImageStorageSupported || !target.IsMultisample()))
{
usage |= ImageUsageFlags.StorageBit;
}
src/Ryujinx.Graphics.Vulkan/TextureView.cs
+6 -6
View File
@@ -61,7 +61,7 @@ namespace Ryujinx.Graphics.Vulkan
gd.Textures.Add(this);
bool isMsImageStorageSupported = gd.Capabilities.SupportsShaderStorageImageMultisample || !info.Target.IsMultisample;
bool isMsImageStorageSupported = gd.Capabilities.SupportsShaderStorageImageMultisample || !info.Target.IsMultisample();
VkFormat format = _gd.FormatCapabilities.ConvertToVkFormat(info.Format, isMsImageStorageSupported);
ImageUsageFlags usage = TextureStorage.GetImageUsage(info.Format, info.Target, gd.Capabilities, isMsImageStorageSupported) & storage.UsageFlags;
@@ -126,7 +126,7 @@ namespace Ryujinx.Graphics.Vulkan
ImageUsageFlags shaderUsage = ImageUsageFlags.SampledBit;
if (info.Format.IsImageCompatible() && (_gd.Capabilities.SupportsShaderStorageImageMultisample || !info.Target.IsMultisample))
if (info.Format.IsImageCompatible() && (_gd.Capabilities.SupportsShaderStorageImageMultisample || !info.Target.IsMultisample()))
{
shaderUsage |= ImageUsageFlags.StorageBit;
}
@@ -225,12 +225,12 @@ namespace Ryujinx.Graphics.Vulkan
Image srcImage = src.GetImage().Get(cbs).Value;
Image dstImage = dst.GetImage().Get(cbs).Value;
if (!dst.Info.Target.IsMultisample && Info.Target.IsMultisample)
if (!dst.Info.Target.IsMultisample() && Info.Target.IsMultisample())
{
int layers = Math.Min(Info.GetLayers(), dst.Info.GetLayers() - firstLayer);
_gd.HelperShader.CopyMSToNonMS(_gd, cbs, src, dst, 0, firstLayer, layers);
}
else if (dst.Info.Target.IsMultisample && !Info.Target.IsMultisample)
else if (dst.Info.Target.IsMultisample() && !Info.Target.IsMultisample())
{
int layers = Math.Min(Info.GetLayers(), dst.Info.GetLayers() - firstLayer);
_gd.HelperShader.CopyNonMSToMS(_gd, cbs, src, dst, 0, firstLayer, layers);
@@ -287,11 +287,11 @@ namespace Ryujinx.Graphics.Vulkan
Image srcImage = src.GetImage().Get(cbs).Value;
Image dstImage = dst.GetImage().Get(cbs).Value;
if (!dst.Info.Target.IsMultisample && Info.Target.IsMultisample)
if (!dst.Info.Target.IsMultisample() && Info.Target.IsMultisample())
{
_gd.HelperShader.CopyMSToNonMS(_gd, cbs, src, dst, srcLayer, dstLayer, 1);
}
else if (dst.Info.Target.IsMultisample && !Info.Target.IsMultisample)
else if (dst.Info.Target.IsMultisample() && !Info.Target.IsMultisample())
{
_gd.HelperShader.CopyNonMSToMS(_gd, cbs, src, dst, srcLayer, dstLayer, 1);
}
src/Ryujinx.Graphics.Vulkan/Vendor.cs
-1
View File
@@ -99,7 +99,6 @@ namespace Ryujinx.Graphics.Vulkan
DriverId.MesaNvk => "NVK",
DriverId.ImaginationOpenSourceMesa => "Imagination (Open)",
DriverId.MesaHoneykrisp => "Honeykrisp",
DriverId.MesaKosmickrisp => "KosmicKrisp",
_ => id.ToString(),
};
}
src/Ryujinx.Graphics.Vulkan/VulkanDriver.cs
-54
View File
@@ -1,54 +0,0 @@
using System;
using System.IO;
using System.Runtime.Versioning;
namespace Ryujinx.Graphics.Vulkan
{
[SupportedOSPlatform("macos")]
public static class VulkanDriver
{
private static string GetIcdPath(string fileName)
{
string baseDir = AppContext.BaseDirectory.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
string contentsDir = Path.GetDirectoryName(baseDir)!;
string[] searchPaths =
[
// .app bundle:
Path.Combine(contentsDir, "Resources", "vulkan", "icd.d", fileName),
// Local build:
Path.Combine(contentsDir, fileName)
];
foreach (string icdPath in searchPaths)
{
if (File.Exists(icdPath))
{
return icdPath;
}
}
throw new FileNotFoundException(
$"{fileName} not found. Searched:\n{string.Join(Environment.NewLine, searchPaths)}");
}
public static void MoltenVK()
{
Environment.SetEnvironmentVariable("MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS", "1");
Environment.SetEnvironmentVariable("MVK_CONFIG_VK_SEMAPHORE_SUPPORT_STYLE", "0");
Environment.SetEnvironmentVariable("MVK_CONFIG_SYNCHRONOUS_QUEUE_SUBMITS", "0");
Environment.SetEnvironmentVariable("MVK_CONFIG_RESUME_LOST_DEVICE", "1");
Environment.SetEnvironmentVariable("VK_DRIVER_FILES", GetIcdPath("MoltenVK_icd.json"));
Console.WriteLine($"[MoltenVK] VK_DRIVER_FILES just set to: {Environment.GetEnvironmentVariable("VK_DRIVER_FILES")}");
}
public static void KosmicKrisp()
{
Environment.SetEnvironmentVariable("VK_DRIVER_FILES", GetIcdPath("libkosmickrisp_icd.json"));
Console.WriteLine($"[KosmicKrisp] VK_DRIVER_FILES just set to: {Environment.GetEnvironmentVariable("VK_DRIVER_FILES")}");
}
}
}
src/Ryujinx.Graphics.Vulkan/VulkanInitialization.cs
+21 -48
View File
@@ -5,6 +5,7 @@ using Silk.NET.Core;
using Silk.NET.Vulkan;
using Silk.NET.Vulkan.Extensions.EXT;
using Silk.NET.Vulkan.Extensions.KHR;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
@@ -13,11 +14,10 @@ namespace Ryujinx.Graphics.Vulkan
{
public unsafe static class VulkanInitialization
{
private static Version32 Version14 => new(1, 4, 0);
private const uint InvalidIndex = uint.MaxValue;
private static readonly uint _minimalVulkanVersion = Vk.Version11.Value;
private static readonly uint _maximumVulkanVersion = Version14.Value;
private static readonly uint _minimalInstanceVulkanVersion = Vk.Version12.Value;
private static readonly uint _maximumVulkanVersion = Vk.Version12.Value;
private const string AppName = "Ryujinx.Graphics.Vulkan";
private const int QueuesCount = 2;
@@ -59,7 +59,7 @@ namespace Ryujinx.Graphics.Vulkan
internal static VulkanInstance CreateInstance(Vk api, GraphicsDebugLevel logLevel, string[] requiredExtensions)
{
List<string> enabledLayers = [];
List<string> enabledLayers = new();
IReadOnlySet<string> instanceExtensions = VulkanInstance.GetInstanceExtensions(api);
IReadOnlySet<string> instanceLayers = VulkanInstance.GetInstanceLayers(api);
@@ -88,7 +88,7 @@ namespace Ryujinx.Graphics.Vulkan
enabledExtensions = enabledExtensions.Append(ExtDebugUtils.ExtensionName).ToArray();
}
nint appName = Marshal.StringToHGlobalAnsi(AppName);
IntPtr appName = Marshal.StringToHGlobalAnsi(AppName);
ApplicationInfo applicationInfo = new()
{
@@ -168,7 +168,7 @@ namespace Ryujinx.Graphics.Vulkan
internal static DeviceInfo[] GetSuitablePhysicalDevices(Vk api)
{
nint appName = Marshal.StringToHGlobalAnsi(AppName);
IntPtr appName = Marshal.StringToHGlobalAnsi(AppName);
ApplicationInfo applicationInfo = new()
{
@@ -197,6 +197,13 @@ namespace Ryujinx.Graphics.Vulkan
using VulkanInstance instance = rawInstance;
// We currently assume that the instance is compatible with Vulkan 1.2
// TODO: Remove this once we relax our initialization codepaths.
if (instance.InstanceVersion < _minimalInstanceVulkanVersion)
{
return [];
}
instance.EnumeratePhysicalDevices(out VulkanPhysicalDevice[] physicalDevices).ThrowOnError();
List<DeviceInfo> deviceInfos = [];
@@ -379,7 +386,7 @@ namespace Ryujinx.Graphics.Vulkan
features2.PNext = &supportedFeaturesDynamicAttachmentFeedbackLoopLayout;
}
PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT supportedFeaturesPageableDeviceLocalMemory = new()
PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT supportedPageableDeviceLocalMemoryFeatures = new()
{
SType = StructureType.PhysicalDevicePageableDeviceLocalMemoryFeaturesExt,
PNext = features2.PNext,
@@ -387,10 +394,10 @@ namespace Ryujinx.Graphics.Vulkan
if (physicalDevice.IsDeviceExtensionPresent(ExtPageableDeviceLocalMemory.ExtensionName))
{
features2.PNext = &supportedFeaturesPageableDeviceLocalMemory;
features2.PNext = &supportedPageableDeviceLocalMemoryFeatures;
}
PhysicalDeviceMemoryPriorityFeaturesEXT supportedFeaturesDeviceMemoryPriority = new()
PhysicalDeviceMemoryPriorityFeaturesEXT supportedDeviceMemoryPriorityFeatures = new()
{
SType = StructureType.PhysicalDeviceMemoryPriorityFeaturesExt,
PNext = features2.PNext,
@@ -398,7 +405,7 @@ namespace Ryujinx.Graphics.Vulkan
if (physicalDevice.IsDeviceExtensionPresent("VK_EXT_memory_priority"))
{
features2.PNext = &supportedFeaturesDeviceMemoryPriority;
features2.PNext = &supportedDeviceMemoryPriorityFeatures;
}
PhysicalDeviceVulkan12Features supportedPhysicalDeviceVulkan12Features = new()
@@ -409,22 +416,6 @@ namespace Ryujinx.Graphics.Vulkan
features2.PNext = &supportedPhysicalDeviceVulkan12Features;
PhysicalDeviceVulkan13Features supportedPhysicalDeviceVulkan13Features = new()
{
SType = StructureType.PhysicalDeviceVulkan13Features,
PNext = features2.PNext,
};
features2.PNext = &supportedPhysicalDeviceVulkan13Features;
PhysicalDeviceVulkan14Features supportedPhysicalDeviceVulkan14Features = new()
{
SType = StructureType.PhysicalDeviceVulkan14Features,
PNext = features2.PNext,
};
features2.PNext = &supportedPhysicalDeviceVulkan14Features;
api.GetPhysicalDeviceFeatures2(physicalDevice.PhysicalDevice, &features2);
PhysicalDeviceFeatures supportedFeatures = features2.Features;
@@ -528,24 +519,6 @@ namespace Ryujinx.Graphics.Vulkan
pExtendedFeatures = &featuresVk12;
PhysicalDeviceVulkan13Features featuresVk13 = new()
{
SType = StructureType.PhysicalDeviceVulkan13Features,
PNext = pExtendedFeatures,
/* Vulkan 1.3 features here */
};
pExtendedFeatures = &featuresVk13;
PhysicalDeviceVulkan13Features featuresVk14 = new()
{
SType = StructureType.PhysicalDeviceVulkan14Features,
PNext = pExtendedFeatures,
/* Vulkan 1.4 features here */
};
pExtendedFeatures = &featuresVk14;
if (physicalDevice.IsDeviceExtensionPresent("VK_EXT_index_type_uint8"))
{
PhysicalDeviceIndexTypeUint8FeaturesEXT featuresIndexU8 = new()
@@ -625,7 +598,7 @@ namespace Ryujinx.Graphics.Vulkan
}
if (physicalDevice.IsDeviceExtensionPresent(ExtPageableDeviceLocalMemory.ExtensionName) &&
supportedFeaturesPageableDeviceLocalMemory.PageableDeviceLocalMemory)
supportedPageableDeviceLocalMemoryFeatures.PageableDeviceLocalMemory)
{
PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT featuresPageableDeviceLocalMemory = new()
{
@@ -638,16 +611,16 @@ namespace Ryujinx.Graphics.Vulkan
}
if (physicalDevice.IsDeviceExtensionPresent("VK_EXT_memory_priority") &&
supportedFeaturesDeviceMemoryPriority.MemoryPriority)
supportedDeviceMemoryPriorityFeatures.MemoryPriority)
{
PhysicalDeviceMemoryPriorityFeaturesEXT featuresMemoryPriority = new()
PhysicalDeviceMemoryPriorityFeaturesEXT featuresDeviceMemoryPriority = new()
{
SType = StructureType.PhysicalDeviceMemoryPriorityFeaturesExt,
PNext = pExtendedFeatures,
MemoryPriority = true,
};
pExtendedFeatures = &featuresMemoryPriority;
pExtendedFeatures = &featuresDeviceMemoryPriority;
}
string[] enabledExtensions = _requiredExtensions.Union(_desirableExtensions.Intersect(physicalDevice.DeviceExtensions)).ToArray();
src/Ryujinx.Graphics.Vulkan/VulkanInstance.cs
+17
View File
@@ -13,6 +13,7 @@ namespace Ryujinx.Graphics.Vulkan
{
private readonly Vk _api;
public readonly Instance Instance;
public readonly Version32 InstanceVersion;
private bool _disposed;
@@ -20,6 +21,22 @@ namespace Ryujinx.Graphics.Vulkan
{
_api = api;
Instance = instance;
if (api.GetInstanceProcAddr(instance, "vkEnumerateInstanceVersion") == nint.Zero)
{
InstanceVersion = Vk.Version10;
}
else
{
uint rawInstanceVersion = 0;
if (api.EnumerateInstanceVersion(ref rawInstanceVersion) != Result.Success)
{
rawInstanceVersion = Vk.Version11.Value;
}
InstanceVersion = (Version32)rawInstanceVersion;
}
}
public static Result Create(Vk api, ref InstanceCreateInfo createInfo, out VulkanInstance instance)
src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs
+23 -17
View File
@@ -3,6 +3,7 @@ using Ryujinx.Common.Logging;
using Ryujinx.Graphics.GAL;
using Ryujinx.Graphics.Shader;
using Ryujinx.Graphics.Shader.Translation;
using Ryujinx.Graphics.Vulkan.MoltenVK;
using Ryujinx.Graphics.Vulkan.Queries;
using Silk.NET.Vulkan;
using Silk.NET.Vulkan.Extensions.EXT;
@@ -54,6 +55,7 @@ namespace Ryujinx.Graphics.Vulkan
internal CommandBufferPool CommandBufferPool { get; private set; }
internal PipelineLayoutCache PipelineLayoutCache { get; private set; }
internal BackgroundResources BackgroundResources { get; private set; }
internal ShaderCompilationQueue ShaderCompilationQueue { get; private set; }
internal Action<Action> InterruptAction { get; private set; }
internal SyncManager SyncManager { get; private set; }
@@ -95,8 +97,8 @@ namespace Ryujinx.Graphics.Vulkan
internal bool IsNvidiaPreTuring { get; private set; }
internal bool IsIntelArc { get; private set; }
internal bool IsQualcommProprietary { get; private set; }
internal bool IsTurnip { get; private set; }
internal bool IsMoltenVk { get; private set; }
internal bool IsKosmicKrisp { get; private set; }
internal bool SupportsMTL31 { get; private set; }
internal bool IsTBDR { get; private set; }
internal bool IsSharedMemory { get; private set; }
@@ -111,7 +113,7 @@ namespace Ryujinx.Graphics.Vulkan
public event EventHandler<ScreenCaptureImageInfo> ScreenCaptured;
public VulkanRenderer(Vk api, Func<Instance, Vk, SurfaceKHR> surfaceFunc, Func<string[]> requiredExtensionsFunc, string preferredGpuId, TranslationLayer translationLayer)
public VulkanRenderer(Vk api, Func<Instance, Vk, SurfaceKHR> surfaceFunc, Func<string[]> requiredExtensionsFunc, string preferredGpuId)
{
_getSurface = surfaceFunc;
_getRequiredExtensions = requiredExtensionsFunc;
@@ -121,20 +123,18 @@ namespace Ryujinx.Graphics.Vulkan
Textures = [];
Samplers = [];
// MoltenVK is required for any device running < macOS 26, even Intel and AMD vendors.
// KosmicKrisp, a Vulkan conformant implementation running on top of Metal 4, requires macOS 26.
if (OperatingSystem.IsMacOS())
{
if (translationLayer == TranslationLayer.MoltenVK)
{
VulkanDriver.MoltenVK();
IsMoltenVk = true;
}
if (translationLayer == TranslationLayer.KosmicKrisp)
{
VulkanDriver.KosmicKrisp();
IsKosmicKrisp = true;
}
MVKInitialization.Initialize();
// Any device running on MacOS is using MoltenVK, even Intel and AMD vendors.
IsMoltenVk = true;
// The default thread stack size on MacOS is low, and can cause stack overflow
// on SPIR-V Cross during shader compilation.
// As a workaround, we use this custom queue which allows us to specify the stack
// size of the threads used for compilation.
ShaderCompilationQueue = new ShaderCompilationQueue();
}
SupportsMTL31 = OperatingSystem.IsMacOSVersionAtLeast(14);
@@ -404,6 +404,8 @@ namespace Ryujinx.Graphics.Vulkan
IsFeedbackLoopDevice = IsAmdRdna3;
IsTurnip = GpuRenderer.StartsWith("Turnip");
if (Vendor == Vendor.Nvidia)
{
Match match = VendorUtils.NvidiaConsumerClassRegex().Match(GpuRenderer);
@@ -484,7 +486,7 @@ namespace Ryujinx.Graphics.Vulkan
Api.TryGetDeviceExtension(_instance.Instance, _device, out ExtExternalMemoryHost hostMemoryApi);
HostMemoryAllocator = new HostMemoryAllocator(MemoryAllocator, Api, hostMemoryApi, _device);
CommandBufferPool = new CommandBufferPool(Api, _device, Queue, QueueLock, queueFamilyIndex, IsQualcommProprietary);
CommandBufferPool = new CommandBufferPool(Api, _device, Queue, QueueLock, queueFamilyIndex, IsQualcommProprietary, IsTurnip);
PipelineLayoutCache = new PipelineLayoutCache();
@@ -785,6 +787,7 @@ namespace Ryujinx.Graphics.Vulkan
supportsGeometryShader: Capabilities.SupportsGeometryShader,
supportsGeometryShaderPassthrough: Capabilities.SupportsGeometryShaderPassthrough,
supportsTransformFeedback: Capabilities.SupportsTransformFeedback,
supportsImageBufferPixelAlignment: false,
supportsImageLoadFormatted: features2.Features.ShaderStorageImageReadWithoutFormat,
supportsLayerVertexTessellation: featuresVk12.ShaderOutputLayer,
supportsMismatchingViewFormat: true,
@@ -798,6 +801,7 @@ namespace Ryujinx.Graphics.Vulkan
supportsShaderNonUniformIndexing:
featuresVk12.ShaderSampledImageArrayNonUniformIndexing &&
featuresVk12.ShaderStorageImageArrayNonUniformIndexing,
supportsTextureBufferPixelAlignment: false,
supportsTextureGatherOffsets: features2.Features.ShaderImageGatherExtended,
supportsTextureShadowLod: false,
supportsVertexStoreAndAtomics: features2.Features.VertexPipelineStoresAndAtomics,
@@ -850,14 +854,14 @@ namespace Ryujinx.Graphics.Vulkan
/// <summary>
/// Gets the available Vulkan devices using the default Vulkan API
/// object returned by <see cref="VulkanSpbApi.GetApiFromSpb()"/>
/// object returned by <see cref="Vk.GetApi()"/>
/// </summary>
/// <returns></returns>
public static DeviceInfo[] GetPhysicalDevices()
{
try
{
return VulkanInitialization.GetSuitablePhysicalDevices(VulkanSpbApi.GetApiFromSpb());
return VulkanInitialization.GetSuitablePhysicalDevices(Vk.GetApi());
}
catch (Exception ex)
{
@@ -1120,6 +1124,8 @@ namespace Ryujinx.Graphics.Vulkan
SurfaceApi.DestroySurface(_instance.Instance, _surface, null);
ShaderCompilationQueue?.Dispose();
Api.DestroyDevice(_device, null);
_debugMessenger.Dispose();
src/Ryujinx.Graphics.Vulkan/VulkanSpbApi.cs
-34
View File
@@ -1,34 +0,0 @@
using Silk.NET.Core.Contexts;
using Silk.NET.Vulkan;
using SPB.Graphics.Vulkan;
namespace Ryujinx.Graphics.Vulkan
{
public static class VulkanSpbApi
{
public static Vk GetApiFromSpb()
{
LamdaNativeContext baseCtx = new(VulkanHelper.GetProcAddress);
MultiNativeContext ctx = new(baseCtx, null);
Vk ret = new(ctx);
ctx.Contexts[1] = new LamdaNativeContext(x =>
{
if (x.EndsWith("ProcAddr"))
{
return default;
}
nint ptr = ret.GetDeviceProcAddr(ret.CurrentDevice.GetValueOrDefault(), x);
if (ptr != default)
{
return ptr;
}
return ret.GetInstanceProcAddr(ret.CurrentInstance.GetValueOrDefault(), x);
});
return ret;
}
}
}
src/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs
+2 -4
View File
@@ -166,15 +166,13 @@ namespace Ryujinx.HLE.HOS.Applets.Error
string[] buttons = GetButtonsText(module, description, "DlgBtn");
(uint Module, uint Description) errorCodeTuple = (module, uint.Parse(description.ToString("0000")));
bool showDetails = _horizon.Device.UIHandler.DisplayErrorAppletDialog($"Error Code: {module}-{description:0000}", "\n" + message, buttons, errorCodeTuple);
bool showDetails = _horizon.Device.UIHandler.DisplayErrorAppletDialog($"Error Code: {module}-{description:0000}", "\n" + message, buttons);
if (showDetails)
{
message = GetMessageText(module, description, "FlvMsg");
buttons = GetButtonsText(module, description, "FlvBtn");
_horizon.Device.UIHandler.DisplayErrorAppletDialog($"Details: {module}-{description:0000}", "\n" + message, buttons, errorCodeTuple);
_horizon.Device.UIHandler.DisplayErrorAppletDialog($"Details: {module}-{description:0000}", "\n" + message, buttons);
}
}
src/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs
+7 -35
View File
@@ -27,19 +27,9 @@ namespace Ryujinx.HLE.HOS.Applets
_normalSession = normalSession;
_interactiveSession = interactiveSession;
UserProfile selected = _system.Device.UIHandler.ShowPlayerSelectDialog();
if (selected == null)
{
_normalSession.Push(BuildResponse());
}
else if (selected.UserId == new UserId("00000000000000000000000000000080"))
{
_normalSession.Push(BuildGuestResponse());
}
else
{
_normalSession.Push(BuildResponse(selected));
}
// TODO(jduncanator): Parse PlayerSelectConfig from input data
_normalSession.Push(BuildResponse());
AppletStateChanged?.Invoke(this, null);
_system.ReturnFocus();
@@ -47,34 +37,16 @@ namespace Ryujinx.HLE.HOS.Applets
return ResultCode.Success;
}
private byte[] BuildResponse(UserProfile selectedUser)
private byte[] BuildResponse()
{
UserProfile currentUser = _system.AccountManager.LastOpenedUser;
using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
using BinaryWriter writer = new(stream);
writer.Write((ulong)PlayerSelectResult.Success);
selectedUser.UserId.Write(writer);
return stream.ToArray();
}
private byte[] BuildGuestResponse()
{
using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
using BinaryWriter writer = new(stream);
writer.Write(new byte());
return stream.ToArray();
}
private byte[] BuildResponse()
{
using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
using BinaryWriter writer = new(stream);
writer.Write((ulong)PlayerSelectResult.Failure);
currentUser.UserId.Write(writer);
return stream.ToArray();
}
src/Ryujinx.HLE/HOS/ArmProcessContext.cs
+9 -6
View File
@@ -1,5 +1,4 @@
using ARMeilleure.Memory;
using ARMeilleure.Translation.PTC;
using Ryujinx.Cpu;
using Ryujinx.Graphics.Gpu;
using Ryujinx.HLE.HOS.Kernel.Process;
@@ -10,10 +9,12 @@ namespace Ryujinx.HLE.HOS
interface IArmProcessContext : IProcessContext
{
IDiskCacheLoadState Initialize(
PtcCacheInfo cacheInfo,
string titleIdText,
string displayVersion,
bool diskCacheEnabled,
ulong codeAddress,
ulong codeSize);
ulong codeSize,
string cacheSelector);
}
class ArmProcessContext<T> : IArmProcessContext where T : class, IVirtualMemoryManagerTracked, IMemoryManager
@@ -63,13 +64,15 @@ namespace Ryujinx.HLE.HOS
}
public IDiskCacheLoadState Initialize(
PtcCacheInfo cacheInfo,
string titleIdText,
string displayVersion,
bool diskCacheEnabled,
ulong codeAddress,
ulong codeSize)
ulong codeSize,
string cacheSelector)
{
_cpuContext.PrepareCodeRange(codeAddress, codeSize);
return _cpuContext.LoadDiskCache(cacheInfo, diskCacheEnabled);
return _cpuContext.LoadDiskCache(titleIdText, displayVersion, diskCacheEnabled, cacheSelector);
}
public void InvalidateCacheRegion(ulong address, ulong size)
src/Ryujinx.HLE/HOS/ArmProcessContextFactory.cs
+4 -22
View File
@@ -1,4 +1,3 @@
using ARMeilleure.Translation.PTC;
using Ryujinx.Common.Configuration;
using Ryujinx.Common.Logging;
using Ryujinx.Cpu;
@@ -8,7 +7,6 @@ using Ryujinx.Cpu.LightningJit;
using Ryujinx.Graphics.Gpu;
using Ryujinx.HLE.HOS.Kernel;
using Ryujinx.HLE.HOS.Kernel.Process;
using Ryujinx.HLE.Loaders.Processes;
using Ryujinx.Memory;
using System;
using System.Runtime.InteropServices;
@@ -19,10 +17,8 @@ namespace Ryujinx.HLE.HOS
{
private readonly ITickSource _tickSource;
private readonly GpuContext _gpu;
private readonly ulong _programId;
private readonly byte _programIndex;
private readonly string _titleIdText;
private readonly string _displayVersion;
private readonly ProcessKind _processKind;
private readonly bool _diskCacheEnabled;
private readonly string _diskCacheSelector;
private readonly ulong _codeAddress;
@@ -33,10 +29,8 @@ namespace Ryujinx.HLE.HOS
public ArmProcessContextFactory(
ITickSource tickSource,
GpuContext gpu,
ulong programId,
byte programIndex,
string titleIdText,
string displayVersion,
ProcessKind processKind,
bool diskCacheEnabled,
string diskCacheSelector,
ulong codeAddress,
@@ -44,10 +38,8 @@ namespace Ryujinx.HLE.HOS
{
_tickSource = tickSource;
_gpu = gpu;
_programId = programId;
_programIndex = programIndex;
_titleIdText = titleIdText;
_displayVersion = displayVersion;
_processKind = processKind;
_diskCacheEnabled = diskCacheEnabled;
_diskCacheSelector = diskCacheSelector;
_codeAddress = codeAddress;
@@ -129,18 +121,8 @@ namespace Ryujinx.HLE.HOS
}
string cacheSelector = _diskCacheSelector ?? "default";
string programIdText = _programId == 0 ? string.Empty : $"{_programId:x16}";
string applicationIdText = _programId == 0 ? string.Empty : $"{_programId & ~0xFul:x16}";
PtcCacheInfo cacheInfo = new(
pid,
programIdText,
applicationIdText,
_programIndex,
_displayVersion,
_processKind.ToString(),
cacheSelector);
DiskCacheLoadState = processContext.Initialize(cacheInfo, _diskCacheEnabled, _codeAddress, _codeSize);
DiskCacheLoadState = processContext.Initialize(_titleIdText, _displayVersion, _diskCacheEnabled, _codeAddress, _codeSize, cacheSelector);
return processContext;
}
src/Ryujinx.HLE/HOS/Kernel/Common/KSystemControl.cs
+5 -5
View File
@@ -26,12 +26,12 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
{
MemoryArrange.MemoryArrange4GiB or
MemoryArrange.MemoryArrange4GiBSystemDev or
MemoryArrange.MemoryArrange6GiBAppletDev => 3173 * MiB,
MemoryArrange.MemoryArrange6GiBAppletDev => 3152 * MiB,
MemoryArrange.MemoryArrange4GiBAppletDev => 2048 * MiB,
MemoryArrange.MemoryArrange6GiB => 4804 * MiB,
MemoryArrange.MemoryArrange8GiB => 6852 * MiB,
MemoryArrange.MemoryArrange10GiB => 8900 * MiB,
MemoryArrange.MemoryArrange12GiB => 10948 * MiB,
MemoryArrange.MemoryArrange6GiB => 4783 * MiB,
MemoryArrange.MemoryArrange8GiB => 6831 * MiB,
MemoryArrange.MemoryArrange10GiB => 8879 * MiB,
MemoryArrange.MemoryArrange12GiB => 10927 * MiB,
_ => throw new ArgumentException($"Invalid memory arrange \"{arrange}\"."),
};
}
src/Ryujinx.HLE/HOS/Kernel/Threading/KAddressArbiter.cs
+26 -25
View File
@@ -15,6 +15,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
private readonly Dictionary<ulong, List<KThread>> _condVarThreads;
private readonly Dictionary<ulong, List<KThread>> _arbiterThreads;
private readonly ByDynamicPriority _byDynamicPriority;
public KAddressArbiter(KernelContext context)
{
@@ -22,6 +23,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
_condVarThreads = [];
_arbiterThreads = [];
_byDynamicPriority = new ByDynamicPriority();
}
public Result ArbitrateLock(int ownerHandle, ulong mutexAddress, int requesterHandle)
@@ -140,9 +142,14 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
if (_condVarThreads.TryGetValue(condVarAddress, out List<KThread> threads))
{
int i = FindDynamicPriorityFifoInsertionIndex(threads, currentThread);
int i = 0;
if (threads.Count > 0)
{
i = threads.BinarySearch(currentThread, _byDynamicPriority);
if (i < 0) i = ~i;
}
threads.Insert(i, currentThread);
}
else
@@ -325,9 +332,14 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
if (_arbiterThreads.TryGetValue(address, out List<KThread> threads))
{
int i = FindDynamicPriorityFifoInsertionIndex(threads, currentThread);
int i = 0;
if (threads.Count > 0)
{
i = threads.BinarySearch(currentThread, _byDynamicPriority);
if (i < 0) i = ~i;
}
threads.Insert(i, currentThread);
}
else
@@ -412,9 +424,14 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
if (_arbiterThreads.TryGetValue(address, out List<KThread> threads))
{
int i = FindDynamicPriorityFifoInsertionIndex(threads, currentThread);
int i = 0;
if (threads.Count > 0)
{
i = threads.BinarySearch(currentThread, _byDynamicPriority);
if (i < 0) i = ~i;
}
threads.Insert(i, currentThread);
}
else
@@ -610,28 +627,12 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
return validCount;
}
private static int FindDynamicPriorityFifoInsertionIndex(List<KThread> threads, KThread currentThread)
private class ByDynamicPriority : IComparer<KThread>
{
int low = 0;
int high = threads.Count;
// Lower numeric values represent higher priorities. Use upper-bound insertion
// to preserve FIFO order among waiters with the same dynamic priority.
while (low < high)
public int Compare(KThread x, KThread y)
{
int middle = low + ((high - low) >> 1);
if (threads[middle].DynamicPriority <= currentThread.DynamicPriority)
{
low = middle + 1;
}
else
{
high = middle;
}
return x!.DynamicPriority.CompareTo(y!.DynamicPriority);
}
return low;
}
}
}
src/Ryujinx.HLE/HOS/ModLoader.cs
+2 -22
View File
@@ -783,28 +783,8 @@ namespace Ryujinx.HLE.HOS
}
List<Cheat> cheats = mods.Cheats;
Dictionary<string, ulong> processExes = new();
foreach ((string buildId, ulong codeAddress) in tamperInfo.BuildIds.Zip(tamperInfo.CodeAddresses))
{
string normalizedBuildId = buildId[..Math.Min(Cheat.CheatIdSize, buildId.Length)];
if (processExes.TryGetValue(normalizedBuildId, out ulong existingAddress))
{
if (existingAddress != codeAddress)
{
Logger.Warning?.Print(
LogClass.ModLoader,
$"Duplicate BuildId prefix '{normalizedBuildId}' has different code addresses. " +
$"Existing: 0x{existingAddress:X}, duplicate: 0x{codeAddress:X}. " +
$"Keeping the first one.");
}
continue;
}
processExes.Add(normalizedBuildId, codeAddress);
}
Dictionary<string, ulong> processExes = tamperInfo.BuildIds.Zip(tamperInfo.CodeAddresses, (k, v) => new { k, v })
.ToDictionary(x => x.k[..Math.Min(Cheat.CheatIdSize, x.k.Length)], x => x.v);
foreach (Cheat cheat in cheats)
{
src/Ryujinx.HLE/HOS/Services/Account/Acc/GuestUserImage.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.8 KiB

Some files were not shown because too many files have changed in this diff Show More