The-Homebrew-Cloud/Ryujinx
2
0
Fork 0
mirror of https://github.com/Ryujinx/Ryujinx.git synced 2024-08-10 14:50:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use maximum shared memory size supported by hardware

Browse Source
This commit is contained in:
gdkchan 2019-12-08 23:55:22 -03:00 committed by Thog
parent 375ee0ba96
commit 0d9672f3ae
6 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Ryujinx.Graphics.GAL/Capabilities.cs
View File

@ -4,17 +4,20 @@ namespace Ryujinx.Graphics.GAL
{ {
public bool SupportsAstcCompression { get; } public bool SupportsAstcCompression { get; }
public int MaximumViewportDimensions { get; } public int MaximumViewportDimensions { get; }
public int StorageBufferOffsetAlignment { get; } public int MaximumComputeSharedMemorySize { get; }
public int StorageBufferOffsetAlignment { get; }
public Capabilities( public Capabilities(
bool supportsAstcCompression, bool supportsAstcCompression,
int maximumViewportDimensions, int maximumViewportDimensions,
int maximumComputeSharedMemorySize,
int storageBufferOffsetAlignment) int storageBufferOffsetAlignment)
{ {
SupportsAstcCompression = supportsAstcCompression; SupportsAstcCompression = supportsAstcCompression;
MaximumViewportDimensions = maximumViewportDimensions; MaximumViewportDimensions = maximumViewportDimensions;
StorageBufferOffsetAlignment = storageBufferOffsetAlignment; MaximumComputeSharedMemorySize = maximumComputeSharedMemorySize;
StorageBufferOffsetAlignment = storageBufferOffsetAlignment;
} }
} }
} }

1
Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs
View File

@ -352,6 +352,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
{ {
return new ShaderCapabilities( return new ShaderCapabilities(
_context.Capabilities.MaximumViewportDimensions, _context.Capabilities.MaximumViewportDimensions,
_context.Capabilities.MaximumComputeSharedMemorySize,
_context.Capabilities.StorageBufferOffsetAlignment); _context.Capabilities.StorageBufferOffsetAlignment);
} }
} }

10
Ryujinx.Graphics.OpenGL/HwCapabilities.cs
View File

@ -7,13 +7,15 @@ namespace Ryujinx.Graphics.OpenGL
{ {
private static Lazy<bool> _supportsAstcCompression = new Lazy<bool>(() => HasExtension("GL_KHR_texture_compression_astc_ldr")); private static Lazy<bool> _supportsAstcCompression = new Lazy<bool>(() => HasExtension("GL_KHR_texture_compression_astc_ldr"));
private static Lazy<int> _maximumViewportDimensions = new Lazy<int>(() => GetLimit(All.MaxViewportDims)); private static Lazy<int> _maximumViewportDimensions = new Lazy<int>(() => GetLimit(All.MaxViewportDims));
private static Lazy<int> _storageBufferOffsetAlignment = new Lazy<int>(() => GetLimit(All.ShaderStorageBufferOffsetAlignment)); private static Lazy<int> _maximumComputeSharedMemorySize = new Lazy<int>(() => GetLimit(All.MaxComputeSharedMemorySize));
private static Lazy<int> _storageBufferOffsetAlignment = new Lazy<int>(() => GetLimit(All.ShaderStorageBufferOffsetAlignment));
public static bool SupportsAstcCompression => _supportsAstcCompression.Value; public static bool SupportsAstcCompression => _supportsAstcCompression.Value;
public static int MaximumViewportDimensions => _maximumViewportDimensions.Value; public static int MaximumViewportDimensions => _maximumViewportDimensions.Value;
public static int StorageBufferOffsetAlignment => _storageBufferOffsetAlignment.Value; public static int MaximumComputeSharedMemorySize => _maximumComputeSharedMemorySize.Value;
public static int StorageBufferOffsetAlignment => _storageBufferOffsetAlignment.Value;
private static bool HasExtension(string name) private static bool HasExtension(string name)
{ {

1
Ryujinx.Graphics.OpenGL/Renderer.cs
View File

@ -64,6 +64,7 @@ namespace Ryujinx.Graphics.OpenGL
return new Capabilities( return new Capabilities(
HwCapabilities.SupportsAstcCompression, HwCapabilities.SupportsAstcCompression,
HwCapabilities.MaximumViewportDimensions, HwCapabilities.MaximumViewportDimensions,
HwCapabilities.MaximumComputeSharedMemorySize,
HwCapabilities.StorageBufferOffsetAlignment); HwCapabilities.StorageBufferOffsetAlignment);
} }

4
Ryujinx.Graphics.Shader/CodeGen/Glsl/Declarations.cs
View File

@ -75,7 +75,9 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl
if (context.Config.Stage == ShaderStage.Compute) if (context.Config.Stage == ShaderStage.Compute)
{ {
context.AppendLine($"shared uint {DefaultNames.SharedMemoryName}[0x100];"); string size = NumberFormatter.FormatInt(context.Config.Capabilities.MaximumComputeSharedMemorySize / 4);
context.AppendLine($"shared uint {DefaultNames.SharedMemoryName}[{size}];");
context.AppendLine(); context.AppendLine();
} }

14
Ryujinx.Graphics.Shader/ShaderCapabilities.cs
View File

@ -2,19 +2,23 @@ namespace Ryujinx.Graphics.Shader
{ {
public struct ShaderCapabilities public struct ShaderCapabilities
{ {
private static readonly ShaderCapabilities _default = new ShaderCapabilities(32768, 16); // Initialize with default values for Maxwell.
private static readonly ShaderCapabilities _default = new ShaderCapabilities(32768, 49152, 16);
public static ShaderCapabilities Default => _default; public static ShaderCapabilities Default => _default;
public int MaximumViewportDimensions { get; } public int MaximumViewportDimensions { get; }
public int StorageBufferOffsetAlignment { get; } public int MaximumComputeSharedMemorySize { get; }
public int StorageBufferOffsetAlignment { get; }
public ShaderCapabilities( public ShaderCapabilities(
int maximumViewportDimensions, int maximumViewportDimensions,
int maximumComputeSharedMemorySize,
int storageBufferOffsetAlignment) int storageBufferOffsetAlignment)
{ {
MaximumViewportDimensions = maximumViewportDimensions; MaximumViewportDimensions = maximumViewportDimensions;
StorageBufferOffsetAlignment = storageBufferOffsetAlignment; MaximumComputeSharedMemorySize = maximumComputeSharedMemorySize;
StorageBufferOffsetAlignment = storageBufferOffsetAlignment;
} }
} }
} }