diff options
Diffstat (limited to 'Ryujinx.Graphics.Texture/LayoutConverter.cs')
| -rw-r--r-- | Ryujinx.Graphics.Texture/LayoutConverter.cs | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/Ryujinx.Graphics.Texture/LayoutConverter.cs b/Ryujinx.Graphics.Texture/LayoutConverter.cs index 2c3d641b..ce2b37b5 100644 --- a/Ryujinx.Graphics.Texture/LayoutConverter.cs +++ b/Ryujinx.Graphics.Texture/LayoutConverter.cs @@ -38,11 +38,12 @@ namespace Ryujinx.Graphics.Texture int outOffs = 0; - int wAlignment = gobBlocksInTileX * (GobStride / bytesPerPixel); - int mipGobBlocksInY = gobBlocksInY; int mipGobBlocksInZ = gobBlocksInZ; + int gobWidth = (GobStride / bytesPerPixel) * gobBlocksInTileX; + int gobHeight = gobBlocksInY * GobHeight; + for (int level = 0; level < levels; level++) { int w = Math.Max(1, width >> level); @@ -66,8 +67,16 @@ namespace Ryujinx.Graphics.Texture int xStart = strideTrunc / bytesPerPixel; - int stride = BitUtils.AlignUp(w * bytesPerPixel, HostStrideAlignment); - int wAligned = BitUtils.AlignUp(w, wAlignment); + int stride = BitUtils.AlignUp(w * bytesPerPixel, HostStrideAlignment); + + int alignment = gobWidth; + + if (d < gobBlocksInZ || w <= gobWidth || h <= gobHeight) + { + alignment = GobStride / bytesPerPixel; + } + + int wAligned = BitUtils.AlignUp(w, alignment); BlockLinearLayout layoutConverter = new BlockLinearLayout( wAligned, @@ -164,11 +173,12 @@ namespace Ryujinx.Graphics.Texture int inOffs = 0; - int wAlignment = gobBlocksInTileX * (GobStride / bytesPerPixel); - int mipGobBlocksInY = gobBlocksInY; int mipGobBlocksInZ = gobBlocksInZ; + int gobWidth = (GobStride / bytesPerPixel) * gobBlocksInTileX; + int gobHeight = gobBlocksInY * GobHeight; + for (int level = 0; level < levels; level++) { int w = Math.Max(1, width >> level); @@ -188,8 +198,16 @@ namespace Ryujinx.Graphics.Texture mipGobBlocksInZ >>= 1; } - int stride = BitUtils.AlignUp(w * bytesPerPixel, HostStrideAlignment); - int wAligned = BitUtils.AlignUp(w, wAlignment); + int stride = BitUtils.AlignUp(w * bytesPerPixel, HostStrideAlignment); + + int alignment = gobWidth; + + if (d < gobBlocksInZ || w <= gobWidth || h <= gobHeight) + { + alignment = GobStride / bytesPerPixel; + } + + int wAligned = BitUtils.AlignUp(w, alignment); BlockLinearLayout layoutConverter = new BlockLinearLayout( wAligned, |