diff options
| author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2018-09-11 12:48:13 -0300 |
|---|---|---|
| committer | gdkchan <gab.dark.100@gmail.com> | 2018-09-11 12:48:13 -0300 |
| commit | e5917f896847b7d76ec98d846af87804fcd47a2e (patch) | |
| tree | 0b35e6bf97ff841008cd1b8fb9f783630722c35b | |
| parent | db1a759c5927f2df9ddd9a08fd691f99bf10e6f8 (diff) | |
Fixup image error message and add G8R8 to size query (#410)
| -rw-r--r-- | Ryujinx.Graphics/Gal/OpenGL/OGLEnumConverter.cs | 4 | ||||
| -rw-r--r-- | Ryujinx.Graphics/Gal/OpenGL/OGLTexture.cs | 2 | ||||
| -rw-r--r-- | Ryujinx.Graphics/Texture/ImageUtils.cs | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Ryujinx.Graphics/Gal/OpenGL/OGLEnumConverter.cs b/Ryujinx.Graphics/Gal/OpenGL/OGLEnumConverter.cs index 1d4f4cf7..69c133a3 100644 --- a/Ryujinx.Graphics/Gal/OpenGL/OGLEnumConverter.cs +++ b/Ryujinx.Graphics/Gal/OpenGL/OGLEnumConverter.cs @@ -176,7 +176,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL case GalImageFormat.D32_S8 | GalImageFormat.Uint: return (PixelInternalFormat.Depth32fStencil8, PixelFormat.DepthStencil, PixelType.Float32UnsignedInt248Rev); } - throw new NotImplementedException(Format.ToString()); + throw new NotImplementedException($"{Format & GalImageFormat.FormatMask} {Format & GalImageFormat.TypeMask}"); } public static InternalFormat GetCompressedImageFormat(GalImageFormat Format) @@ -195,7 +195,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL case GalImageFormat.BC5 | GalImageFormat.Unorm: return InternalFormat.CompressedRgRgtc2; } - throw new NotImplementedException(Format.ToString()); + throw new NotImplementedException($"{Format & GalImageFormat.FormatMask} {Format & GalImageFormat.TypeMask}"); } public static All GetTextureSwizzle(GalTextureSource Source) diff --git a/Ryujinx.Graphics/Gal/OpenGL/OGLTexture.cs b/Ryujinx.Graphics/Gal/OpenGL/OGLTexture.cs index 82f9c913..7e1c0e53 100644 --- a/Ryujinx.Graphics/Gal/OpenGL/OGLTexture.cs +++ b/Ryujinx.Graphics/Gal/OpenGL/OGLTexture.cs @@ -82,7 +82,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL Image.Height, 1); - Image.Format = GalImageFormat.R8G8 | (Image.Format & GalImageFormat.FormatMask); + Image.Format = GalImageFormat.R8G8 | (Image.Format & GalImageFormat.TypeMask); } (PixelInternalFormat InternalFormat, PixelFormat Format, PixelType Type) = OGLEnumConverter.GetImageFormat(Image.Format); diff --git a/Ryujinx.Graphics/Texture/ImageUtils.cs b/Ryujinx.Graphics/Texture/ImageUtils.cs index ccea43ec..c09eaf86 100644 --- a/Ryujinx.Graphics/Texture/ImageUtils.cs +++ b/Ryujinx.Graphics/Texture/ImageUtils.cs @@ -235,6 +235,7 @@ namespace Ryujinx.Graphics.Texture case GalImageFormat.A1R5G5B5: case GalImageFormat.B5G6R5: case GalImageFormat.R8G8: + case GalImageFormat.G8R8: case GalImageFormat.R16: case GalImageFormat.D16: return Image.Width * Image.Height * 2; |