Mirror/Ryujinx
3
5
Fork 13
mirror of https://github.com/Ryujinx/Ryujinx.git synced 2024-11-28 07:54:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use Quads on OpenGL host when supported. (#2331)

Browse source 
Improves OpenGL performance on FAST RMX and Xenoblade DE/2. Will probably only work on NVIDIA GPUs, but the emulated quads path will still be valid for other GPUs. Note: SLOW RMX gets a bit faster in handheld mode.

I'd recommend checking on platforms without supported host quads to make sure a GL error is actually thrown when attempting GL.Begin(PrimitiveType.Quads)
This commit is contained in:
riperiperi 2021-06-02 12:27:30 +01:00 committed by GitHub
parent 7527c5b906
commit fe29aff266
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Ryujinx.Graphics.OpenGL/HwCapabilities.cs
View file

@ -11,6 +11,7 @@ namespace Ryujinx.Graphics.OpenGL
private static readonly Lazy<bool> _supportsViewportSwizzle = new Lazy<bool>(() => HasExtension("GL_NV_viewport_swizzle")); private static readonly Lazy<bool> _supportsViewportSwizzle = new Lazy<bool>(() => HasExtension("GL_NV_viewport_swizzle"));
private static readonly Lazy<bool> _supportsSeamlessCubemapPerTexture = new Lazy<bool>(() => HasExtension("GL_ARB_seamless_cubemap_per_texture")); private static readonly Lazy<bool> _supportsSeamlessCubemapPerTexture = new Lazy<bool>(() => HasExtension("GL_ARB_seamless_cubemap_per_texture"));
private static readonly Lazy<bool> _supportsParallelShaderCompile = new Lazy<bool>(() => HasExtension("GL_ARB_parallel_shader_compile")); private static readonly Lazy<bool> _supportsParallelShaderCompile = new Lazy<bool>(() => HasExtension("GL_ARB_parallel_shader_compile"));
private static readonly Lazy<bool> _supportsQuads = new Lazy<bool>(SupportsQuadsCheck);
private static readonly Lazy<int> _maximumComputeSharedMemorySize = new Lazy<int>(() => GetLimit(All.MaxComputeSharedMemorySize)); private static readonly Lazy<int> _maximumComputeSharedMemorySize = new Lazy<int>(() => GetLimit(All.MaxComputeSharedMemorySize));
private static readonly Lazy<int> _storageBufferOffsetAlignment = new Lazy<int>(() => GetLimit(All.ShaderStorageBufferOffsetAlignment)); private static readonly Lazy<int> _storageBufferOffsetAlignment = new Lazy<int>(() => GetLimit(All.ShaderStorageBufferOffsetAlignment));
@ -36,6 +37,7 @@ namespace Ryujinx.Graphics.OpenGL
public static bool SupportsViewportSwizzle => _supportsViewportSwizzle.Value; public static bool SupportsViewportSwizzle => _supportsViewportSwizzle.Value;
public static bool SupportsSeamlessCubemapPerTexture => _supportsSeamlessCubemapPerTexture.Value; public static bool SupportsSeamlessCubemapPerTexture => _supportsSeamlessCubemapPerTexture.Value;
public static bool SupportsParallelShaderCompile => _supportsParallelShaderCompile.Value; public static bool SupportsParallelShaderCompile => _supportsParallelShaderCompile.Value;
public static bool SupportsQuads => _supportsQuads.Value;
public static bool SupportsNonConstantTextureOffset => _gpuVendor.Value == GpuVendor.Nvidia; public static bool SupportsNonConstantTextureOffset => _gpuVendor.Value == GpuVendor.Nvidia;
public static bool RequiresSyncFlush => _gpuVendor.Value == GpuVendor.Amd || _gpuVendor.Value == GpuVendor.IntelWindows || _gpuVendor.Value == GpuVendor.IntelUnix; public static bool RequiresSyncFlush => _gpuVendor.Value == GpuVendor.Amd || _gpuVendor.Value == GpuVendor.IntelWindows || _gpuVendor.Value == GpuVendor.IntelUnix;
public static bool SupportsMismatchingViewFormat => _gpuVendor.Value != GpuVendor.Amd && _gpuVendor.Value != GpuVendor.IntelWindows; public static bool SupportsMismatchingViewFormat => _gpuVendor.Value != GpuVendor.Amd && _gpuVendor.Value != GpuVendor.IntelWindows;
@ -88,5 +90,14 @@ namespace Ryujinx.Graphics.OpenGL
return GpuVendor.Unknown; return GpuVendor.Unknown;
} }
} }
private static bool SupportsQuadsCheck()
{
GL.GetError(); // Clear any existing error.
GL.Begin(PrimitiveType.Quads);
GL.End();
return GL.GetError() == ErrorCode.NoError;
}
} }
} }

8
Ryujinx.Graphics.OpenGL/Pipeline.cs
View file

@ -182,11 +182,11 @@ namespace Ryujinx.Graphics.OpenGL
PreDraw(); PreDraw();
if (_primitiveType == PrimitiveType.Quads) if (_primitiveType == PrimitiveType.Quads && !HwCapabilities.SupportsQuads)
{ {
DrawQuadsImpl(vertexCount, instanceCount, firstVertex, firstInstance); DrawQuadsImpl(vertexCount, instanceCount, firstVertex, firstInstance);
} }
else if (_primitiveType == PrimitiveType.QuadStrip) else if (_primitiveType == PrimitiveType.QuadStrip && !HwCapabilities.SupportsQuads)
{ {
DrawQuadStripImpl(vertexCount, instanceCount, firstVertex, firstInstance); DrawQuadStripImpl(vertexCount, instanceCount, firstVertex, firstInstance);
} }
@ -310,7 +310,7 @@ namespace Ryujinx.Graphics.OpenGL
IntPtr indexBaseOffset = _indexBaseOffset + firstIndex * indexElemSize; IntPtr indexBaseOffset = _indexBaseOffset + firstIndex * indexElemSize;
if (_primitiveType == PrimitiveType.Quads) if (_primitiveType == PrimitiveType.Quads && !HwCapabilities.SupportsQuads)
{ {
DrawQuadsIndexedImpl( DrawQuadsIndexedImpl(
indexCount, indexCount,
@ -320,7 +320,7 @@ namespace Ryujinx.Graphics.OpenGL
firstVertex, firstVertex,
firstInstance); firstInstance);
} }
else if (_primitiveType == PrimitiveType.QuadStrip) else if (_primitiveType == PrimitiveType.QuadStrip && !HwCapabilities.SupportsQuads)
{ {
DrawQuadStripIndexedImpl( DrawQuadStripIndexedImpl(
indexCount, indexCount,