From 3bd357045f7581ee10d6c86ed8049bcebe35eda0 Mon Sep 17 00:00:00 2001 From: gdkchan Date: Wed, 16 Feb 2022 19:15:39 -0300 Subject: Do not allow render targets not explicitly written by the fragment shader to be modified (#3063) * Do not allow render targets not explicitly written by the fragment shader to be modified * Shader cache version bump * Remove blank lines * Avoid redundant color mask updates * HostShaderCacheEntry can be null * Avoid more redundant glColorMask calls * nit: Mask -> Masks * Fix currentComponentMask * More efficient way to update _currentComponentMasks --- .../Multithreading/Resources/Programs/BinaryProgramRequest.cs | 8 ++++++-- .../Multithreading/Resources/Programs/SourceProgramRequest.cs | 6 ++++-- Ryujinx.Graphics.GAL/Multithreading/ThreadedRenderer.cs | 8 ++++---- 3 files changed, 14 insertions(+), 8 deletions(-) (limited to 'Ryujinx.Graphics.GAL/Multithreading') diff --git a/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/BinaryProgramRequest.cs b/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/BinaryProgramRequest.cs index 96bfedf8..b4c6853f 100644 --- a/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/BinaryProgramRequest.cs +++ b/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/BinaryProgramRequest.cs @@ -5,17 +5,21 @@ public ThreadedProgram Threaded { get; set; } private byte[] _data; + private bool _hasFragmentShader; + private ShaderInfo _info; - public BinaryProgramRequest(ThreadedProgram program, byte[] data) + public BinaryProgramRequest(ThreadedProgram program, byte[] data, bool hasFragmentShader, ShaderInfo info) { Threaded = program; _data = data; + _hasFragmentShader = hasFragmentShader; + _info = info; } public IProgram Create(IRenderer renderer) { - return renderer.LoadProgramBinary(_data); + return renderer.LoadProgramBinary(_data, _hasFragmentShader, _info); } } } diff --git a/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/SourceProgramRequest.cs b/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/SourceProgramRequest.cs index 8e4cd1d4..d808fe22 100644 --- a/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/SourceProgramRequest.cs +++ b/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/SourceProgramRequest.cs @@ -7,12 +7,14 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Resources.Programs public ThreadedProgram Threaded { get; set; } private IShader[] _shaders; + private ShaderInfo _info; - public SourceProgramRequest(ThreadedProgram program, IShader[] shaders) + public SourceProgramRequest(ThreadedProgram program, IShader[] shaders, ShaderInfo info) { Threaded = program; _shaders = shaders; + _info = info; } public IProgram Create(IRenderer renderer) @@ -24,7 +26,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Resources.Programs return threaded?.Base; }).ToArray(); - return renderer.CreateProgram(shaders); + return renderer.CreateProgram(shaders, _info); } } } diff --git a/Ryujinx.Graphics.GAL/Multithreading/ThreadedRenderer.cs b/Ryujinx.Graphics.GAL/Multithreading/ThreadedRenderer.cs index df46b428..5030fee6 100644 --- a/Ryujinx.Graphics.GAL/Multithreading/ThreadedRenderer.cs +++ b/Ryujinx.Graphics.GAL/Multithreading/ThreadedRenderer.cs @@ -268,10 +268,10 @@ namespace Ryujinx.Graphics.GAL.Multithreading return handle; } - public IProgram CreateProgram(IShader[] shaders) + public IProgram CreateProgram(IShader[] shaders, ShaderInfo info) { var program = new ThreadedProgram(this); - SourceProgramRequest request = new SourceProgramRequest(program, shaders); + SourceProgramRequest request = new SourceProgramRequest(program, shaders, info); Programs.Add(request); New().Set(Ref((IProgramRequest)request)); @@ -355,11 +355,11 @@ namespace Ryujinx.Graphics.GAL.Multithreading _baseRenderer.Initialize(logLevel); } - public IProgram LoadProgramBinary(byte[] programBinary) + public IProgram LoadProgramBinary(byte[] programBinary, bool hasFragmentShader, ShaderInfo info) { var program = new ThreadedProgram(this); - BinaryProgramRequest request = new BinaryProgramRequest(program, programBinary); + BinaryProgramRequest request = new BinaryProgramRequest(program, programBinary, hasFragmentShader, info); Programs.Add(request); New().Set(Ref((IProgramRequest)request)); -- cgit v1.2.3