From 8931f0570300231192aa9f6c0b303e774da183ac Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Thu, 24 Apr 2025 01:16:49 +1000 Subject: [PATCH] Remove redundant `IPipeline.SetUniformMatrix` overload --- src/BizHawk.Bizware.Graphics/D3D11/D3D11Pipeline.cs | 3 --- src/BizHawk.Bizware.Graphics/ImGuiResourceCache.cs | 2 +- src/BizHawk.Bizware.Graphics/Interfaces/IPipeline.cs | 5 ----- src/BizHawk.Bizware.Graphics/OpenGL/OpenGLPipeline.cs | 3 --- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/BizHawk.Bizware.Graphics/D3D11/D3D11Pipeline.cs b/src/BizHawk.Bizware.Graphics/D3D11/D3D11Pipeline.cs index ebfc1b57b9..5638bfe68e 100644 --- a/src/BizHawk.Bizware.Graphics/D3D11/D3D11Pipeline.cs +++ b/src/BizHawk.Bizware.Graphics/D3D11/D3D11Pipeline.cs @@ -392,9 +392,6 @@ namespace BizHawk.Bizware.Graphics } } - public void SetUniformMatrix(string name, Matrix4x4 mat, bool transpose) - => SetUniformMatrix(name, ref mat, transpose); - public unsafe void SetUniformMatrix(string name, ref Matrix4x4 mat, bool transpose) { var m = transpose ? Matrix4x4.Transpose(mat) : mat; diff --git a/src/BizHawk.Bizware.Graphics/ImGuiResourceCache.cs b/src/BizHawk.Bizware.Graphics/ImGuiResourceCache.cs index 50c7a60ce7..b679367dfb 100644 --- a/src/BizHawk.Bizware.Graphics/ImGuiResourceCache.cs +++ b/src/BizHawk.Bizware.Graphics/ImGuiResourceCache.cs @@ -61,7 +61,7 @@ namespace BizHawk.Bizware.Graphics internal void SetProjection(int width, int height) { var projection = _igl.CreateGuiViewMatrix(width, height) * _igl.CreateGuiProjectionMatrix(width, height); - Pipeline.SetUniformMatrix("um44Projection", projection); + Pipeline.SetUniformMatrix("um44Projection", ref projection); } internal void SetTexture(ITexture2D texture2D) diff --git a/src/BizHawk.Bizware.Graphics/Interfaces/IPipeline.cs b/src/BizHawk.Bizware.Graphics/Interfaces/IPipeline.cs index c86a31bc30..bfe3d7acfc 100644 --- a/src/BizHawk.Bizware.Graphics/Interfaces/IPipeline.cs +++ b/src/BizHawk.Bizware.Graphics/Interfaces/IPipeline.cs @@ -23,11 +23,6 @@ namespace BizHawk.Bizware.Graphics /// void SetUniformSampler(string name, ITexture2D tex); - /// - /// Sets a uniform value - /// - void SetUniformMatrix(string name, Matrix4x4 mat, bool transpose = false); - /// /// Sets a uniform value /// diff --git a/src/BizHawk.Bizware.Graphics/OpenGL/OpenGLPipeline.cs b/src/BizHawk.Bizware.Graphics/OpenGL/OpenGLPipeline.cs index 64397a0d98..688e7f8133 100644 --- a/src/BizHawk.Bizware.Graphics/OpenGL/OpenGLPipeline.cs +++ b/src/BizHawk.Bizware.Graphics/OpenGL/OpenGLPipeline.cs @@ -263,9 +263,6 @@ namespace BizHawk.Bizware.Graphics } } - public void SetUniformMatrix(string name, Matrix4x4 mat, bool transpose) - => SetUniformMatrix(name, ref mat, transpose); - public unsafe void SetUniformMatrix(string name, ref Matrix4x4 mat, bool transpose) { if (_uniforms.TryGetValue(name, out var uid))