diff --git a/src/BizHawk.Bizware.BizwareGL/IGL.cs b/src/BizHawk.Bizware.BizwareGL/IGL.cs index dfb59393d3..1fe49740ae 100644 --- a/src/BizHawk.Bizware.BizwareGL/IGL.cs +++ b/src/BizHawk.Bizware.BizwareGL/IGL.cs @@ -113,10 +113,9 @@ namespace BizHawk.Bizware.BizwareGL /// BitmapBuffer ResolveTexture2d(Texture2d texture); - /// - /// Sets a 2d texture parameter - /// - void TexParameter2d(Texture2d texture, TextureParameterName pname, int param); + void SetMinFilter(Texture2d texture, TextureMinFilter minFilter); + + void SetMagFilter(Texture2d texture, TextureMagFilter magFilter); /// /// creates a vertex layout resource diff --git a/src/BizHawk.Bizware.BizwareGL/Texture2d.cs b/src/BizHawk.Bizware.BizwareGL/Texture2d.cs index a399e23fe4..ad62d61569 100644 --- a/src/BizHawk.Bizware.BizwareGL/Texture2d.cs +++ b/src/BizHawk.Bizware.BizwareGL/Texture2d.cs @@ -41,15 +41,9 @@ namespace BizHawk.Bizware.BizwareGL { } - public void SetMinFilter(TextureMinFilter minFilter) - { - Owner.TexParameter2d(this,TextureParameterName.TextureMinFilter, (int)minFilter); - } + public void SetMinFilter(TextureMinFilter minFilter) => Owner.SetMinFilter(this, minFilter); - public void SetMagFilter(TextureMagFilter magFilter) - { - Owner.TexParameter2d(this, TextureParameterName.TextureMagFilter, (int)magFilter); - } + public void SetMagFilter(TextureMagFilter magFilter) => Owner.SetMagFilter(this, magFilter); public void SetFilterLinear() { diff --git a/src/BizHawk.Bizware.DirectX/IGL_SlimDX9.cs b/src/BizHawk.Bizware.DirectX/IGL_SlimDX9.cs index 65446a5756..774e95c201 100644 --- a/src/BizHawk.Bizware.DirectX/IGL_SlimDX9.cs +++ b/src/BizHawk.Bizware.DirectX/IGL_SlimDX9.cs @@ -649,24 +649,15 @@ namespace BizHawk.Bizware.DirectX tw.WrapClamp = clamp ? TextureAddress.Clamp : TextureAddress.Wrap; } - public void TexParameter2d(Texture2d tex, gl.TextureParameterName pName, int param) - { - var tw = (TextureWrapper)tex.Opaque; + public void SetMinFilter(Texture2d texture, gl.TextureMinFilter minFilter) + => ((TextureWrapper) texture.Opaque).MinFilter = minFilter == gl.TextureMinFilter.Linear + ? TextureFilter.Linear + : TextureFilter.Point; - if (pName == gl.TextureParameterName.TextureMinFilter) - { - tw.MinFilter = param == (int)gl.TextureMinFilter.Linear - ? TextureFilter.Linear - : TextureFilter.Point; - } - - if (pName == gl.TextureParameterName.TextureMagFilter) - { - tw.MagFilter = param == (int)gl.TextureMagFilter.Linear - ? TextureFilter.Linear - : TextureFilter.Point; - } - } + public void SetMagFilter(Texture2d texture, gl.TextureMagFilter magFilter) + => ((TextureWrapper) texture.Opaque).MagFilter = magFilter == gl.TextureMagFilter.Linear + ? TextureFilter.Linear + : TextureFilter.Point; public Texture2d LoadTexture(Bitmap bitmap) { diff --git a/src/BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_GdiPlus.cs b/src/BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_GdiPlus.cs index 8cc9d535c9..ad2b33bc71 100644 --- a/src/BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_GdiPlus.cs +++ b/src/BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_GdiPlus.cs @@ -135,14 +135,11 @@ namespace BizHawk.Client.EmuHawk } - public void TexParameter2d(Texture2d tex, TextureParameterName pname, int param) - { - var tw = tex.Opaque as GDIPTextureWrapper; - if (pname == TextureParameterName.TextureMinFilter) - tw.MinFilter = (TextureMinFilter)param; - if (pname == TextureParameterName.TextureMagFilter) - tw.MagFilter = (TextureMagFilter)param; - } + public void SetMinFilter(Texture2d texture, TextureMinFilter minFilter) + => ((GDIPTextureWrapper) texture.Opaque).MinFilter = minFilter; + + public void SetMagFilter(Texture2d texture, TextureMagFilter magFilter) + => ((GDIPTextureWrapper) texture.Opaque).MagFilter = magFilter; public Texture2d LoadTexture(Bitmap bitmap) { diff --git a/src/BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_TK.cs b/src/BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_TK.cs index a57dcdf31a..256f8a7835 100644 --- a/src/BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_TK.cs +++ b/src/BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_TK.cs @@ -427,10 +427,16 @@ namespace BizHawk.Client.EmuHawk GL.BindTexture(TextureTarget.Texture2D, (int)tex.Opaque); } - public void TexParameter2d(Texture2d tex, TextureParameterName pName, int param) + public void SetMinFilter(Texture2d texture, TextureMinFilter minFilter) { - BindTexture2d(tex); - GL.TexParameter(TextureTarget.Texture2D, pName, param); + BindTexture2d(texture); + GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int) minFilter); + } + + public void SetMagFilter(Texture2d texture, TextureMagFilter magFilter) + { + BindTexture2d(texture); + GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int) magFilter); } public Texture2d LoadTexture(sd.Bitmap bitmap)