mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-08-18 06:38:42 +02:00
Fixup image error message and add G8R8 to size query (#410)
This commit is contained in:
parent
db1a759c59
commit
e5917f8968
3 changed files with 4 additions and 3 deletions
|
@ -176,7 +176,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
|
||||||
case GalImageFormat.D32_S8 | GalImageFormat.Uint: return (PixelInternalFormat.Depth32fStencil8, PixelFormat.DepthStencil, PixelType.Float32UnsignedInt248Rev);
|
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)
|
public static InternalFormat GetCompressedImageFormat(GalImageFormat Format)
|
||||||
|
@ -195,7 +195,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
|
||||||
case GalImageFormat.BC5 | GalImageFormat.Unorm: return InternalFormat.CompressedRgRgtc2;
|
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)
|
public static All GetTextureSwizzle(GalTextureSource Source)
|
||||||
|
|
|
@ -82,7 +82,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
|
||||||
Image.Height,
|
Image.Height,
|
||||||
1);
|
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);
|
(PixelInternalFormat InternalFormat, PixelFormat Format, PixelType Type) = OGLEnumConverter.GetImageFormat(Image.Format);
|
||||||
|
|
|
@ -235,6 +235,7 @@ namespace Ryujinx.Graphics.Texture
|
||||||
case GalImageFormat.A1R5G5B5:
|
case GalImageFormat.A1R5G5B5:
|
||||||
case GalImageFormat.B5G6R5:
|
case GalImageFormat.B5G6R5:
|
||||||
case GalImageFormat.R8G8:
|
case GalImageFormat.R8G8:
|
||||||
|
case GalImageFormat.G8R8:
|
||||||
case GalImageFormat.R16:
|
case GalImageFormat.R16:
|
||||||
case GalImageFormat.D16:
|
case GalImageFormat.D16:
|
||||||
return Image.Width * Image.Height * 2;
|
return Image.Width * Image.Height * 2;
|
||||||
|
|
Loading…
Reference in a new issue