vance/ryujinx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add A1B5G5R5 texture format. (#76)

Browse Source 
* Update GalTextureFormat.cs

* Update TextureReader.cs
This commit is contained in:
LDj3SNuD 2018-04-08 23:08:36 +02:00 committed by gdkchan
parent ecf02f525f
commit e9cfdef098
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Ryujinx.Graphics/Gal/GalTextureFormat.cs
View File

@ -3,8 +3,9 @@ namespace Ryujinx.Graphics.Gal
public enum GalTextureFormat public enum GalTextureFormat
{ {
A8B8G8R8 = 0x8, A8B8G8R8 = 0x8,
A1B5G5R5 = 0x14,
BC1 = 0x24, BC1 = 0x24,
BC2 = 0x25, BC2 = 0x25,
BC3 = 0x26 BC3 = 0x26
} }
} }

32
Ryujinx.Graphics/Gpu/TextureReader.cs
View File

@ -11,6 +11,7 @@ namespace Ryujinx.Graphics.Gpu
switch (Texture.Format) switch (Texture.Format)
{ {
case GalTextureFormat.A8B8G8R8: return Read4Bpp (Memory, Texture); case GalTextureFormat.A8B8G8R8: return Read4Bpp (Memory, Texture);
case GalTextureFormat.A1B5G5R5: return Read2Bpp (Memory, Texture);
case GalTextureFormat.BC1: return Read8Bpt4x4 (Memory, Texture); case GalTextureFormat.BC1: return Read8Bpt4x4 (Memory, Texture);
case GalTextureFormat.BC2: return Read16Bpt4x4(Memory, Texture); case GalTextureFormat.BC2: return Read16Bpt4x4(Memory, Texture);
case GalTextureFormat.BC3: return Read16Bpt4x4(Memory, Texture); case GalTextureFormat.BC3: return Read16Bpt4x4(Memory, Texture);
@ -48,6 +49,35 @@ namespace Ryujinx.Graphics.Gpu
return Output; return Output;
} }
private unsafe static byte[] Read2Bpp(AMemory Memory, Texture Texture)
{
int Width = Texture.Width;
int Height = Texture.Height;
byte[] Output = new byte[Width * Height * 2];
ISwizzle Swizzle = GetSwizzle(Texture, 2);
fixed (byte* BuffPtr = Output)
{
long OutOffs = 0;
for (int Y = 0; Y < Height; Y++)
for (int X = 0; X < Width; X++)
{
long Offset = (uint)Swizzle.GetSwizzleOffset(X, Y);
short Pixel = Memory.ReadInt16Unchecked(Texture.Position + Offset);
*(short*)(BuffPtr + OutOffs) = Pixel;
OutOffs += 2;
}
}
return Output;
}
private unsafe static byte[] Read8Bpt4x4(AMemory Memory, Texture Texture) private unsafe static byte[] Read8Bpt4x4(AMemory Memory, Texture Texture)
{ {
int Width = (Texture.Width + 3) / 4; int Width = (Texture.Width + 3) / 4;
@ -124,4 +154,4 @@ namespace Ryujinx.Graphics.Gpu
throw new NotImplementedException(Texture.Swizzle.ToString()); throw new NotImplementedException(Texture.Swizzle.ToString());
} }
} }
} }