From f03a43fa3850b2b645f8899a775f873a3f6a1d60 Mon Sep 17 00:00:00 2001 From: gdkchan Date: Sat, 2 Jun 2018 13:39:52 -0300 Subject: [PATCH] Fix copy-paste mistake, also related to astc... --- Ryujinx.Graphics/Gal/OpenGL/OGLTexture.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Ryujinx.Graphics/Gal/OpenGL/OGLTexture.cs b/Ryujinx.Graphics/Gal/OpenGL/OGLTexture.cs index 46c15dcc1..2cbe6913d 100644 --- a/Ryujinx.Graphics/Gal/OpenGL/OGLTexture.cs +++ b/Ryujinx.Graphics/Gal/OpenGL/OGLTexture.cs @@ -70,10 +70,10 @@ namespace Ryujinx.Graphics.Gal.OpenGL GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureSwizzleA, SwizzleA); } - private GalTexture ConvertAstcTextureToRgba(GalTexture Texture) + private static GalTexture ConvertAstcTextureToRgba(GalTexture Texture) { int TextureBlockWidth = GetAstcBlockWidth(Texture.Format); - int TextureBlockHeight = GetAstcBlockWidth(Texture.Format); + int TextureBlockHeight = GetAstcBlockHeight(Texture.Format); Texture.Data = ASTCDecoder.DecodeToRGBA8888( Texture.Data, @@ -87,7 +87,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL return Texture; } - private int GetAstcBlockWidth(GalTextureFormat Format) + private static int GetAstcBlockWidth(GalTextureFormat Format) { switch (Format) { @@ -110,7 +110,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL throw new ArgumentException(nameof(Format)); } - private int GetAstcBlockHeight(GalTextureFormat Format) + private static int GetAstcBlockHeight(GalTextureFormat Format) { switch (Format) {