mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename GalFrameBufferFormat to GalSurfaceFormat

Browse source
This commit is contained in:
ReinUsesLisp 2018-09-05 03:09:21 -03:00
commit 9f99c6bd41
3 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ryujinx.Graphics/Gal/GalFrameBufferFormat.cs
View file

@ -1,6 +1,6 @@
namespace Ryujinx.Graphics.Gal namespace Ryujinx.Graphics.Gal
{ {
public enum GalFrameBufferFormat public enum GalSurfaceFormat
{ {
Bitmap = 0x1c, Bitmap = 0x1c,
Unknown1D = 0x1d, Unknown1D = 0x1d,

2
Ryujinx.Graphics/NvGpuEngine3d.cs
View file

@ -201,7 +201,7 @@ namespace Ryujinx.Graphics
int VpW = (int)(TX + MathF.Abs(SX)) - VpX; int VpW = (int)(TX + MathF.Abs(SX)) - VpX;
int VpH = (int)(TY + MathF.Abs(SY)) - VpY; int VpH = (int)(TY + MathF.Abs(SY)) - VpY;
GalImageFormat ImageFormat = ImageTable.ConvertFrameBuffer((GalFrameBufferFormat)Format); GalImageFormat ImageFormat = ImageTable.ConvertSurface((GalSurfaceFormat)Format);
GalImage Image = new GalImage(Width, Height, ImageFormat); GalImage Image = new GalImage(Width, Height, ImageFormat);

40
Ryujinx.Graphics/Texture/ImageTable.cs
View file

@ -157,29 +157,29 @@ namespace Ryujinx.Graphics.Texture
} }
} }
public static GalImageFormat ConvertFrameBuffer(GalFrameBufferFormat Format) public static GalImageFormat ConvertSurface(GalSurfaceFormat Format)
{ {
switch (Format) switch (Format)
{ {
case GalFrameBufferFormat.RGBA32Float: return GalImageFormat.R32G32B32A32 | Sfloat; case GalSurfaceFormat.RGBA32Float: return GalImageFormat.R32G32B32A32 | Sfloat;
case GalFrameBufferFormat.RGBA16Float: return GalImageFormat.R16G16B16A16 | Sfloat; case GalSurfaceFormat.RGBA16Float: return GalImageFormat.R16G16B16A16 | Sfloat;
case GalFrameBufferFormat.RG32Float: return GalImageFormat.R32G32 | Sfloat; case GalSurfaceFormat.RG32Float: return GalImageFormat.R32G32 | Sfloat;
case GalFrameBufferFormat.RG32Sint: return GalImageFormat.R32G32 | Sint; case GalSurfaceFormat.RG32Sint: return GalImageFormat.R32G32 | Sint;
case GalFrameBufferFormat.RG32Uint: return GalImageFormat.R32G32 | Uint; case GalSurfaceFormat.RG32Uint: return GalImageFormat.R32G32 | Uint;
case GalFrameBufferFormat.BGRA8Unorm: return GalImageFormat.R8G8B8A8 | Unorm; //Is this right? case GalSurfaceFormat.BGRA8Unorm: return GalImageFormat.R8G8B8A8 | Unorm; //Is this right?
case GalFrameBufferFormat.BGRA8Srgb: return GalImageFormat.A8B8G8R8_SRGB; //This one might be wrong case GalSurfaceFormat.BGRA8Srgb: return GalImageFormat.A8B8G8R8_SRGB; //This one might be wrong
case GalFrameBufferFormat.RGB10A2Unorm: return GalImageFormat.A2B10G10R10 | Unorm; case GalSurfaceFormat.RGB10A2Unorm: return GalImageFormat.A2B10G10R10 | Unorm;
case GalFrameBufferFormat.RGBA8Unorm: return GalImageFormat.A8B8G8R8 | Unorm; case GalSurfaceFormat.RGBA8Unorm: return GalImageFormat.A8B8G8R8 | Unorm;
case GalFrameBufferFormat.RGBA8Srgb: return GalImageFormat.A8B8G8R8_SRGB; case GalSurfaceFormat.RGBA8Srgb: return GalImageFormat.A8B8G8R8_SRGB;
case GalFrameBufferFormat.RGBA8Snorm: return GalImageFormat.A8B8G8R8 | Snorm; case GalSurfaceFormat.RGBA8Snorm: return GalImageFormat.A8B8G8R8 | Snorm;
case GalFrameBufferFormat.RG16Snorm: return GalImageFormat.R16G16 | Snorm; case GalSurfaceFormat.RG16Snorm: return GalImageFormat.R16G16 | Snorm;
case GalFrameBufferFormat.RG16Float: return GalImageFormat.R16G16 | Sfloat; case GalSurfaceFormat.RG16Float: return GalImageFormat.R16G16 | Sfloat;
case GalFrameBufferFormat.R11G11B10Float: return GalImageFormat.B10G11R11 | Sfloat; case GalSurfaceFormat.R11G11B10Float: return GalImageFormat.B10G11R11 | Sfloat;
case GalFrameBufferFormat.R32Float: return GalImageFormat.R32 | Sfloat; case GalSurfaceFormat.R32Float: return GalImageFormat.R32 | Sfloat;
case GalFrameBufferFormat.RG8Unorm: return GalImageFormat.R8G8 | Unorm; case GalSurfaceFormat.RG8Unorm: return GalImageFormat.R8G8 | Unorm;
case GalFrameBufferFormat.RG8Snorm: return GalImageFormat.R8 | Snorm; case GalSurfaceFormat.RG8Snorm: return GalImageFormat.R8 | Snorm;
case GalFrameBufferFormat.R16Float: return GalImageFormat.R16 | Sfloat; case GalSurfaceFormat.R16Float: return GalImageFormat.R16 | Sfloat;
case GalFrameBufferFormat.R8Unorm: return GalImageFormat.R8 | Unorm; case GalSurfaceFormat.R8Unorm: return GalImageFormat.R8 | Unorm;
} }
throw new NotImplementedException(Format.ToString()); throw new NotImplementedException(Format.ToString());