N-archive/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use correct pitch value when decoding linear swizzle textures

Browse source
This commit is contained in:
gdkchan 2018-04-08 17:09:41 -03:00
parent b9aa3966c0
commit 36dfd20c87
4 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Ryujinx.Graphics/Gpu/LinearSwizzle.cs
View file

@ -2,19 +2,18 @@ namespace Ryujinx.Graphics.Gpu
{ {
class LinearSwizzle : ISwizzle class LinearSwizzle : ISwizzle
{ {
private int Pitch;
private int Bpp; private int Bpp;
private int Stride;
public LinearSwizzle(int Width, int Bpp) public LinearSwizzle(int Pitch, int Bpp)
{ {
this.Pitch = Pitch;
this.Bpp = Bpp; this.Bpp = Bpp;
Stride = Width * Bpp;
} }
public int GetSwizzleOffset(int X, int Y) public int GetSwizzleOffset(int X, int Y)
{ {
return X * Bpp + Y * Stride; return X * Bpp + Y * Pitch;
} }
} }
} }

3
Ryujinx.Graphics/Gpu/Texture.cs
View file

@ -8,6 +8,7 @@ namespace Ryujinx.Graphics.Gpu
public int Width { get; private set; } public int Width { get; private set; }
public int Height { get; private set; } public int Height { get; private set; }
public int Pitch { get; private set; }
public int BlockHeight { get; private set; } public int BlockHeight { get; private set; }
@ -19,6 +20,7 @@ namespace Ryujinx.Graphics.Gpu
long Position, long Position,
int Width, int Width,
int Height, int Height,
int Pitch,
int BlockHeight, int BlockHeight,
TextureSwizzle Swizzle, TextureSwizzle Swizzle,
GalTextureFormat Format) GalTextureFormat Format)
@ -26,6 +28,7 @@ namespace Ryujinx.Graphics.Gpu
this.Position = Position; this.Position = Position;
this.Width = Width; this.Width = Width;
this.Height = Height; this.Height = Height;
this.Pitch = Pitch;
this.BlockHeight = BlockHeight; this.BlockHeight = BlockHeight;
this.Swizzle = Swizzle; this.Swizzle = Swizzle;
this.Format = Format; this.Format = Format;

3
Ryujinx.Graphics/Gpu/TextureFactory.cs
View file

@ -20,6 +20,8 @@ namespace Ryujinx.Graphics.Gpu
TextureSwizzle Swizzle = (TextureSwizzle)((Tic[2] >> 21) & 7); TextureSwizzle Swizzle = (TextureSwizzle)((Tic[2] >> 21) & 7);
int Pitch = (Tic[3] & 0xffff) << 5;
int BlockHeightLog2 = (Tic[3] >> 3) & 7; int BlockHeightLog2 = (Tic[3] >> 3) & 7;
int BlockHeight = 1 << BlockHeightLog2; int BlockHeight = 1 << BlockHeightLog2;
@ -31,6 +33,7 @@ namespace Ryujinx.Graphics.Gpu
TextureAddress, TextureAddress,
Width, Width,
Height, Height,
Pitch,
BlockHeight, BlockHeight,
Swizzle, Swizzle,
Format); Format);

16
Ryujinx.Graphics/Gpu/TextureReader.cs
View file

@ -26,7 +26,7 @@ namespace Ryujinx.Graphics.Gpu
byte[] Output = new byte[Width * Height * 4]; byte[] Output = new byte[Width * Height * 4];
ISwizzle Swizzle = GetSwizzle(Texture.Swizzle, Width, 4, Texture.BlockHeight); ISwizzle Swizzle = GetSwizzle(Texture, 4);
fixed (byte* BuffPtr = Output) fixed (byte* BuffPtr = Output)
{ {
@ -55,7 +55,7 @@ namespace Ryujinx.Graphics.Gpu
byte[] Output = new byte[Width * Height * 8]; byte[] Output = new byte[Width * Height * 8];
ISwizzle Swizzle = GetSwizzle(Texture.Swizzle, Width, 8, Texture.BlockHeight); ISwizzle Swizzle = GetSwizzle(Texture, 8);
fixed (byte* BuffPtr = Output) fixed (byte* BuffPtr = Output)
{ {
@ -84,7 +84,7 @@ namespace Ryujinx.Graphics.Gpu
byte[] Output = new byte[Width * Height * 16]; byte[] Output = new byte[Width * Height * 16];
ISwizzle Swizzle = GetSwizzle(Texture.Swizzle, Width, 16, Texture.BlockHeight); ISwizzle Swizzle = GetSwizzle(Texture, 16);
fixed (byte* BuffPtr = Output) fixed (byte* BuffPtr = Output)
{ {
@ -108,20 +108,20 @@ namespace Ryujinx.Graphics.Gpu
return Output; return Output;
} }
private static ISwizzle GetSwizzle(TextureSwizzle Swizzle, int Width, int Bpp, int BlockHeight) private static ISwizzle GetSwizzle(Texture Texture, int Bpp)
{ {
switch (Swizzle) switch (Texture.Swizzle)
{ {
case TextureSwizzle.Pitch: case TextureSwizzle.Pitch:
case TextureSwizzle.PitchColorKey: case TextureSwizzle.PitchColorKey:
return new LinearSwizzle(Width, Bpp); return new LinearSwizzle(Texture.Pitch, Bpp);
case TextureSwizzle.BlockLinear: case TextureSwizzle.BlockLinear:
case TextureSwizzle.BlockLinearColorKey: case TextureSwizzle.BlockLinearColorKey:
return new BlockLinearSwizzle(Width, Bpp, BlockHeight); return new BlockLinearSwizzle(Texture.Width, Bpp, Texture.BlockHeight);
} }
throw new NotImplementedException(Swizzle.ToString()); throw new NotImplementedException(Texture.Swizzle.ToString());
} }
} }
} }