Cool_Tools/Switch-Toolbox
1
0
Fork 0
mirror of synced 2024-11-28 09:20:57 +01:00
Code Releases Wiki Activity

More fixes to tex regs

Browse Source
This commit is contained in:
KillzXGaming 2019-07-14 19:16:36 -04:00
parent 7e89e63fe3
commit 4a87ceb8a0
8 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/Switch_Toolbox/v15/.suo
View File

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide
View File

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal
View File

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache
View File

Binary file not shown.

7
Switch_Toolbox_Library/Swizzling/GX2.cs
View File

@ -432,7 +432,12 @@ namespace Switch_Toolbox.Library.Old
public static uint[] CreateRegisters(GX2Surface surface)
{
return GX2TexRegisters.CreateTexRegs(surface.width, surface.height, surface.numMips, surface.format, surface.tileMode, surface.pitch, surface.compSel);
Console.WriteLine("BCN " + IsFormatBCN((GX2SurfaceFormat)surface.format));
if (IsFormatBCN((GX2SurfaceFormat)surface.format))
return GX2TexRegisters.CreateTexRegs(surface.width, surface.height, surface.numMips, surface.format, surface.tileMode, surface.pitch * 4, surface.compSel);
else
return GX2TexRegisters.CreateTexRegs(surface.width, surface.height, surface.numMips, surface.format, surface.tileMode, surface.pitch, surface.compSel);
}
public static void GenerateMipSurfaceData(GX2Surface surface)

12
Switch_Toolbox_Library/Swizzling/GX2TexRegisters.cs
View File

@ -12,7 +12,7 @@ namespace Switch_Toolbox.Library
/*
Copyright © 2018 AboodXD
Licensed under GNU GPLv3*/
public static int _register0(int width, int pitch, int tileType, int tileMode, int dim)
public static uint _register0(uint width, uint pitch, uint tileType, uint tileMode, uint dim)
{
return (
(width & 0x1FFF) << 19
@ -26,9 +26,9 @@ namespace Switch_Toolbox.Library
public static int _register1(int format_, int depth, int height)
{
return (
(format_ & 0x3F) << 26
| (depth & 0x1FFF) << 13
| (height & 0x1FFF));
(format_ & 0x3F) << 26
| (depth & 0x1FFF) << 13
| (height & 0x1FFF));
}
public static int _register2(int baseLevel, int dstSelW, int dstSelZ, int dstSelY, int dstSelX, int requestSize, int endian, int forceDegamma, int surfMode, int numFormat, int formatComp)
@ -82,7 +82,7 @@ namespace Switch_Toolbox.Library
}
pitch = Math.Max(pitch, 8);
var register0 = _register0((int)width - 1, (int)(pitch / 8) - 1, 0, (int)tileMode, 1);
var register0 = _register0(width - 1, (pitch / 8) - 1, 0, tileMode, 1);
// register1
var register1 = _register1((int)format_, 0, (int)height - 1);
@ -117,7 +117,7 @@ namespace Switch_Toolbox.Library
byte[] reg3 = BitConverter.GetBytes(IPAddress.HostToNetworkOrder(register3));
byte[] reg4 = BitConverter.GetBytes(IPAddress.HostToNetworkOrder(register4));*/
return new uint[5] { (uint)register0, (uint)register1, (uint)register2, (uint)register3, (uint)register4 };
return new uint[5] { register0, (uint)register1, (uint)register2, (uint)register3, (uint)register4 };
}
}

5
Switch_Toolbox_Library/Swizzling/NewSwizzleCodeBackup.cs
View File

@ -616,7 +616,10 @@ namespace Switch_Toolbox.Library
public static uint[] CreateRegisters(GX2Surface surface)
{
return GX2TexRegisters.CreateTexRegs(surface.width, surface.height, surface.numMips, surface.format, surface.tileMode, surface.pitch, surface.compSel);
if (IsFormatBCN((GX2SurfaceFormat)surface.format))
return GX2TexRegisters.CreateTexRegs(surface.width, surface.height, surface.numMips, surface.format, surface.tileMode, surface.pitch * 4, surface.compSel);
else
return GX2TexRegisters.CreateTexRegs(surface.width, surface.height, surface.numMips, surface.format, surface.tileMode, surface.pitch, surface.compSel);
}
public static byte[] Decode(GX2Surface tex, int ArrayIndex = -1, int MipIndex = -1, string DebugTextureName = "")