From cb171f6ebfa7e1aa5721503d1c1115719957932d Mon Sep 17 00:00:00 2001 From: gdkchan Date: Fri, 6 Dec 2019 19:37:00 -0300 Subject: Support shared color mask, implement more shader instructions Support shared color masks (used by Nouveau and maybe the NVIDIA driver). Support draw buffers (also required by OpenGL). Support viewport transform disable (disabled for now as it breaks some games). Fix instanced rendering draw being ignored for multi draw. Fix IADD and IADD3 immediate shader encodings, that was not matching some ops. Implement FFMA32I shader instruction. Implement IMAD shader instruction. --- Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs | 33 ++++++++++++++++++------------ 1 file changed, 20 insertions(+), 13 deletions(-) (limited to 'Ryujinx.Graphics.Gpu/Shader') diff --git a/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs b/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs index 8e39662d..6e3a42a2 100644 --- a/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs +++ b/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs @@ -69,7 +69,7 @@ namespace Ryujinx.Graphics.Gpu.Shader return cpShader; } - public GraphicsShader GetGraphicsShader(ShaderAddresses addresses) + public GraphicsShader GetGraphicsShader(ShaderAddresses addresses, bool dividePosXY) { bool isCached = _gpPrograms.TryGetValue(addresses, out List list); @@ -86,19 +86,28 @@ namespace Ryujinx.Graphics.Gpu.Shader GraphicsShader gpShaders = new GraphicsShader(); + TranslationFlags flags = + TranslationFlags.DebugMode | + TranslationFlags.Unspecialized; + + if (dividePosXY) + { + flags |= TranslationFlags.DividePosXY; + } + if (addresses.VertexA != 0) { - gpShaders.Shader[0] = TranslateGraphicsShader(addresses.Vertex, addresses.VertexA); + gpShaders.Shader[0] = TranslateGraphicsShader(flags, addresses.Vertex, addresses.VertexA); } else { - gpShaders.Shader[0] = TranslateGraphicsShader(addresses.Vertex); + gpShaders.Shader[0] = TranslateGraphicsShader(flags, addresses.Vertex); } - gpShaders.Shader[1] = TranslateGraphicsShader(addresses.TessControl); - gpShaders.Shader[2] = TranslateGraphicsShader(addresses.TessEvaluation); - gpShaders.Shader[3] = TranslateGraphicsShader(addresses.Geometry); - gpShaders.Shader[4] = TranslateGraphicsShader(addresses.Fragment); + gpShaders.Shader[1] = TranslateGraphicsShader(flags, addresses.TessControl); + gpShaders.Shader[2] = TranslateGraphicsShader(flags, addresses.TessEvaluation); + gpShaders.Shader[3] = TranslateGraphicsShader(flags, addresses.Geometry); + gpShaders.Shader[4] = TranslateGraphicsShader(flags, addresses.Fragment); BackpropQualifiers(gpShaders); @@ -218,7 +227,7 @@ namespace Ryujinx.Graphics.Gpu.Shader return new CachedShader(program, codeCached); } - private CachedShader TranslateGraphicsShader(ulong gpuVa, ulong gpuVaA = 0) + private CachedShader TranslateGraphicsShader(TranslationFlags flags, ulong gpuVa, ulong gpuVaA = 0) { if (gpuVa == 0) { @@ -227,10 +236,6 @@ namespace Ryujinx.Graphics.Gpu.Shader ShaderProgram program; - const TranslationFlags flags = - TranslationFlags.DebugMode | - TranslationFlags.Unspecialized; - int[] codeCached = null; if (gpuVaA != 0) @@ -345,7 +350,9 @@ namespace Ryujinx.Graphics.Gpu.Shader private ShaderCapabilities GetShaderCapabilities() { - return new ShaderCapabilities(_context.Capabilities.StorageBufferOffsetAlignment); + return new ShaderCapabilities( + _context.Capabilities.MaximumViewportDimensions, + _context.Capabilities.StorageBufferOffsetAlignment); } } } \ No newline at end of file -- cgit v1.2.3