From b549daed034225a0b305dc40497d73983cc3827e Mon Sep 17 00:00:00 2001 From: gdkchan Date: Sat, 1 Sep 2018 18:51:51 -0300 Subject: [PATCH] Fix exception throw message for unimpl texture formats (#398) --- Ryujinx.Graphics/Gal/ImageFormatConverter.cs | 2 +- Ryujinx.HLE/Gpu/Texture/TextureHelper.cs | 2 +- Ryujinx.HLE/Gpu/Texture/TextureReader.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Ryujinx.Graphics/Gal/ImageFormatConverter.cs b/Ryujinx.Graphics/Gal/ImageFormatConverter.cs index 8684ba9618..7aa39f5fb0 100644 --- a/Ryujinx.Graphics/Gal/ImageFormatConverter.cs +++ b/Ryujinx.Graphics/Gal/ImageFormatConverter.cs @@ -125,7 +125,7 @@ namespace Ryujinx.Graphics.Gal break; } - throw new NotImplementedException("0x" + Format.ToString("x2") + " " + Type.ToString()); + throw new NotImplementedException("0x" + ((int)Format).ToString("x2") + " " + Type.ToString()); } public static GalImageFormat ConvertFrameBuffer(GalFrameBufferFormat Format) diff --git a/Ryujinx.HLE/Gpu/Texture/TextureHelper.cs b/Ryujinx.HLE/Gpu/Texture/TextureHelper.cs index 98da852eee..2683174d8c 100644 --- a/Ryujinx.HLE/Gpu/Texture/TextureHelper.cs +++ b/Ryujinx.HLE/Gpu/Texture/TextureHelper.cs @@ -178,7 +178,7 @@ namespace Ryujinx.HLE.Gpu.Texture } } - throw new NotImplementedException("0x" + Image.Format.ToString("x2")); + throw new NotImplementedException(Image.Format.ToString()); } public static int CompressedTextureSize(int TextureWidth, int TextureHeight, int BlockWidth, int BlockHeight, int Bpb) diff --git a/Ryujinx.HLE/Gpu/Texture/TextureReader.cs b/Ryujinx.HLE/Gpu/Texture/TextureReader.cs index 65fa7e6ebe..d293bf9f1b 100644 --- a/Ryujinx.HLE/Gpu/Texture/TextureReader.cs +++ b/Ryujinx.HLE/Gpu/Texture/TextureReader.cs @@ -50,7 +50,7 @@ namespace Ryujinx.HLE.Gpu.Texture case GalTextureFormat.Astc2D10x6: return Read16BptCompressedTexture(Memory, Texture, 10, 6); } - throw new NotImplementedException("0x" + Texture.Format.ToString("x2")); + throw new NotImplementedException("0x" + ((int)Texture.Format).ToString("x2")); } private unsafe static byte[] Read1Bpp(IAMemory Memory, TextureInfo Texture)