Mirrors/Switch-Toolbox
2
0
Fork 0
mirror of https://github.com/KillzXGaming/Switch-Toolbox synced 2024-11-26 14:30:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Revert "Revert "Quick fix for switch textures with strange resolutions."""

Browse source 
This reverts commit 2866344409.
This commit is contained in:
KillzXGaming 2020-07-20 19:52:11 -04:00
parent 2866344409
commit b673b3ee60
2 changed files with 4 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
File_Format_Library/GUI/TextureUI/Importers/BNTX/TextureImporterSettings.cs
View file

@ -350,19 +350,6 @@ namespace FirstPlugin
Console.WriteLine("MipOffsets " + SurfaceSize); Console.WriteLine("MipOffsets " + SurfaceSize);
Console.WriteLine("size " + size); Console.WriteLine("size " + size);
int powBlockShift = 0;
if (STGenericTexture.IsCompressed(TexFormat) && mipLevel == 0)
{
if (width_ > 32 && height_ <= 40)
powBlockShift += 1;
if (width_ > 64 && height_ <= 84)
powBlockShift += 1;
if (width_ > 128 && height_ <= 168)
powBlockShift += 1;
if (width_ > 256 && height_ <= 340)
powBlockShift += 1;
}
tex.MipOffsets[mipLevel] = SurfaceSize; tex.MipOffsets[mipLevel] = SurfaceSize;
if (tex.TileMode == TileMode.LinearAligned) if (tex.TileMode == TileMode.LinearAligned)
{ {
@ -379,12 +366,10 @@ namespace FirstPlugin
blockHeightShift += 1; blockHeightShift += 1;
Pitch = TegraX1Swizzle.round_up(width__ * bpp, 64); Pitch = TegraX1Swizzle.round_up(width__ * bpp, 64);
SurfaceSize += Pitch * TegraX1Swizzle.round_up(height__, Math.Max(1, blockHeight >> (blockHeightShift + powBlockShift)) * 8); SurfaceSize += Pitch * TegraX1Swizzle.round_up(height__, Math.Max(1, blockHeight >> blockHeightShift) * 8);
} }
int blockShift = blockHeightShift + powBlockShift; byte[] SwizzledData = TegraX1Swizzle.swizzle(width_, height_, depth_, blkWidth, blkHeight, blkDepth, target, bpp, (uint)tex.TileMode, (int)Math.Max(0, tex.BlockHeightLog2 - blockHeightShift), data_);
byte[] SwizzledData = TegraX1Swizzle.swizzle(width_, height_, depth_, blkWidth, blkHeight, blkDepth, target, bpp, (uint)tex.TileMode, (int)Math.Max(0, tex.BlockHeightLog2 - blockShift), data_);
mipmaps.Add(AlignedData.Concat(SwizzledData).ToArray()); mipmaps.Add(AlignedData.Concat(SwizzledData).ToArray());
} }
tex.ImageSize = SurfaceSize; tex.ImageSize = SurfaceSize;

19
Switch_Toolbox_Library/Texture Decoding/Switch/TegraX1Swizzle.cs
View file

@ -103,21 +103,6 @@ namespace Toolbox.Library
if (TegraX1Swizzle.pow2_round_up(TegraX1Swizzle.DIV_ROUND_UP(height, blkWidth)) < linesPerBlockHeight) if (TegraX1Swizzle.pow2_round_up(TegraX1Swizzle.DIV_ROUND_UP(height, blkWidth)) < linesPerBlockHeight)
blockHeightShift += 1; blockHeightShift += 1;
int powBlockShift = 0;
if (STGenericTexture.IsCompressed(texture.Format) && mipLevel == 0)
{
if (width > 32 && height <= 40)
powBlockShift += 1;
if (width > 64 && height <= 84)
powBlockShift += 1;
if (width > 128 && height <= 168)
powBlockShift += 1;
if (width > 256 && height <= 340)
powBlockShift += 1;
}
int blockShift = blockHeightShift + powBlockShift;
uint width__ = TegraX1Swizzle.DIV_ROUND_UP(width, blkWidth); uint width__ = TegraX1Swizzle.DIV_ROUND_UP(width, blkWidth);
uint height__ = TegraX1Swizzle.DIV_ROUND_UP(height, blkHeight); uint height__ = TegraX1Swizzle.DIV_ROUND_UP(height, blkHeight);
@ -134,9 +119,9 @@ namespace Toolbox.Library
try try
{ {
Pitch = TegraX1Swizzle.round_up(width__ * bpp, 64); Pitch = TegraX1Swizzle.round_up(width__ * bpp, 64);
SurfaceSize += Pitch * TegraX1Swizzle.round_up(height__, Math.Max(1, blockHeight >> blockShift) * 8); SurfaceSize += Pitch * TegraX1Swizzle.round_up(height__, Math.Max(1, blockHeight >> blockHeightShift) * 8);
byte[] result = TegraX1Swizzle.deswizzle(width, height, depth, blkWidth, blkHeight, blkDepth, target, bpp, TileMode, (int)Math.Max(0, BlockHeightLog2 - blockShift), data_); byte[] result = TegraX1Swizzle.deswizzle(width, height, depth, blkWidth, blkHeight, blkDepth, target, bpp, TileMode, (int)Math.Max(0, BlockHeightLog2 - blockHeightShift), data_);
//Create a copy and use that to remove uneeded data //Create a copy and use that to remove uneeded data
byte[] result_ = new byte[size]; byte[] result_ = new byte[size];
Array.Copy(result, 0, result_, 0, size); Array.Copy(result, 0, result_, 0, size);