- Add patched gxtexconv. (extremscorner/gamecube-tools@846a04a)

- Optimize intensity + alpha textures.

cube/swiss/Makefile

@@ -9,6 +9,14 @@ endif
 
 include $(DEVKITPPC)/base_rules
 
+BUILDTOOLS	:=	$(shell git rev-parse --show-toplevel)/buildtools
+
+ifeq ($(OS),Windows_NT)
+GXTEXCONV	:=	$(BUILDTOOLS)/gxtexconv.exe
+else
+GXTEXCONV	:=	$(BUILDTOOLS)/gxtexconv
+endif
+
 PORTLIBS	:=	$(PORTLIBS_PATH)/gamecube $(PORTLIBS_PATH)/ppc
 
 export PATH	:=	$(PORTLIBS_PATH)/gamecube/bin:$(PORTLIBS_PATH)/ppc/bin:$(PATH)
@@ -27,7 +35,7 @@ MACHDEP =  -DGEKKO -mvgc -mcpu=750 -meabi -mhard-float
 #---------------------------------------------------------------------------------
 %.tpl : %.scf
 	$(SILENTMSG) $(notdir $<)
-	$(SILENTCMD)gxtexconv -s $< -d $(DEPSDIR)/$*.d -o $@
+	$(SILENTCMD)$(GXTEXCONV) -s $< -d $(DEPSDIR)/$*.d -o $@
 
 #---------------------------------------------------------------------------------
 %.elf:

cube/swiss/source/devices/fat/deviceHandler-FAT.c

@@ -512,7 +512,7 @@ DEVICEHANDLER_INTERFACE __device_sd_a = {
 	"SD Card Adapter",
 	"SD Card - Slot A",
 	"SD(HC/XC) Card - Supported File System(s): FAT16, FAT32, exFAT",
-	{TEX_SDSMALL, 59, 78, 60, 80},
+	{TEX_SDSMALL, 59, 78, 64, 80},
 	FEAT_READ|FEAT_WRITE|FEAT_BOOT_GCM|FEAT_BOOT_DEVICE|FEAT_CONFIG_DEVICE|FEAT_AUTOLOAD_DOL|FEAT_FAT_FUNCS|FEAT_HYPERVISOR|FEAT_PATCHES|FEAT_AUDIO_STREAMING,
 	EMU_READ|EMU_READ_SPEED|EMU_AUDIO_STREAMING|EMU_MEMCARD,
 	LOC_MEMCARD_SLOT_A,
@@ -538,7 +538,7 @@ DEVICEHANDLER_INTERFACE __device_sd_b = {
 	"SD Card Adapter",
 	"SD Card - Slot B",
 	"SD(HC/XC) Card - Supported File System(s): FAT16, FAT32, exFAT",
-	{TEX_SDSMALL, 59, 78, 60, 80},
+	{TEX_SDSMALL, 59, 78, 64, 80},
 	FEAT_READ|FEAT_WRITE|FEAT_BOOT_GCM|FEAT_BOOT_DEVICE|FEAT_CONFIG_DEVICE|FEAT_AUTOLOAD_DOL|FEAT_FAT_FUNCS|FEAT_HYPERVISOR|FEAT_PATCHES|FEAT_AUDIO_STREAMING,
 	EMU_READ|EMU_READ_SPEED|EMU_AUDIO_STREAMING|EMU_MEMCARD,
 	LOC_MEMCARD_SLOT_B,
@@ -564,7 +564,7 @@ DEVICEHANDLER_INTERFACE __device_ata_a = {
 	"IDE-EXI",
 	"IDE-EXI - Slot A",
 	"IDE/PATA HDD - Supported File System(s): FAT16, FAT32, exFAT",
-	{TEX_HDD, 104, 73, 104, 76},
+	{TEX_HDD, 104, 73, 112, 80},
 	FEAT_READ|FEAT_WRITE|FEAT_BOOT_GCM|FEAT_BOOT_DEVICE|FEAT_CONFIG_DEVICE|FEAT_AUTOLOAD_DOL|FEAT_FAT_FUNCS|FEAT_HYPERVISOR|FEAT_PATCHES|FEAT_AUDIO_STREAMING,
 	EMU_READ|EMU_AUDIO_STREAMING|EMU_MEMCARD,
 	LOC_MEMCARD_SLOT_A,
@@ -590,7 +590,7 @@ DEVICEHANDLER_INTERFACE __device_ata_b = {
 	"IDE-EXI",
 	"IDE-EXI - Slot B",
 	"IDE/PATA HDD - Supported File System(s): FAT16, FAT32, exFAT",
-	{TEX_HDD, 104, 73, 104, 76},
+	{TEX_HDD, 104, 73, 112, 80},
 	FEAT_READ|FEAT_WRITE|FEAT_BOOT_GCM|FEAT_BOOT_DEVICE|FEAT_CONFIG_DEVICE|FEAT_AUTOLOAD_DOL|FEAT_FAT_FUNCS|FEAT_HYPERVISOR|FEAT_PATCHES|FEAT_AUDIO_STREAMING,
 	EMU_READ|EMU_AUDIO_STREAMING|EMU_MEMCARD,
 	LOC_MEMCARD_SLOT_B,
@@ -616,7 +616,7 @@ DEVICEHANDLER_INTERFACE __device_sd_c = {
 	"SD Card Adapter",
 	"SD Card - SD2SP2",
 	"SD(HC/XC) Card - Supported File System(s): FAT16, FAT32, exFAT",
-	{TEX_SDSMALL, 59, 78, 60, 80},
+	{TEX_SDSMALL, 59, 78, 64, 80},
 	FEAT_READ|FEAT_WRITE|FEAT_BOOT_GCM|FEAT_BOOT_DEVICE|FEAT_CONFIG_DEVICE|FEAT_AUTOLOAD_DOL|FEAT_FAT_FUNCS|FEAT_HYPERVISOR|FEAT_PATCHES|FEAT_AUDIO_STREAMING,
 	EMU_READ|EMU_READ_SPEED|EMU_AUDIO_STREAMING|EMU_MEMCARD,
 	LOC_SERIAL_PORT_2,

cube/swiss/source/devices/memcard/deviceHandler-CARD.c

@@ -533,7 +533,7 @@ DEVICEHANDLER_INTERFACE __device_card_a = {
 	"Memory Card",
 	"Memory Card - Slot A",
 	"Backup & Restore save games",
-	{TEX_MEMCARD, 76, 84, 76, 84},
+	{TEX_MEMCARD, 76, 84, 80, 88},
 	FEAT_READ|FEAT_WRITE|FEAT_BOOT_DEVICE,
 	EMU_NONE,
 	LOC_MEMCARD_SLOT_A,
@@ -559,7 +559,7 @@ DEVICEHANDLER_INTERFACE __device_card_b = {
 	"Memory Card",
 	"Memory Card - Slot B",
 	"Backup & Restore save games",
-	{TEX_MEMCARD, 76, 84, 76, 84},
+	{TEX_MEMCARD, 76, 84, 80, 88},
 	FEAT_READ|FEAT_WRITE|FEAT_BOOT_DEVICE,
 	EMU_NONE,
 	LOC_MEMCARD_SLOT_B,

cube/swiss/source/devices/qoob/deviceHandler-Qoob.c

@@ -140,7 +140,7 @@ DEVICEHANDLER_INTERFACE __device_qoob = {
 	"Qoob Modchip",
 	"Qoob Pro",
 	"Qoob Pro Flash File System",
-	{TEX_QOOB, 82, 84, 84, 84},
+	{TEX_QOOB, 82, 84, 88, 88},
 	FEAT_READ,
 	EMU_NONE,
 	LOC_SYSTEM,

cube/swiss/source/devices/usbgecko/deviceHandler-usbgecko.c

@@ -236,7 +236,7 @@ DEVICEHANDLER_INTERFACE __device_usbgecko = {
 	"USB Gecko",
 	"USB Gecko - Slot B only",
 	"Requires PC application to be up",
-	{TEX_USBGECKO, 64, 84, 64, 84},
+	{TEX_USBGECKO, 60, 84, 64, 88},
 	FEAT_READ|FEAT_BOOT_GCM|FEAT_HYPERVISOR,
 	EMU_READ,
 	LOC_MEMCARD_SLOT_B,

cube/swiss/source/gui/FrameBufferMagic.c

@@ -33,13 +33,19 @@
 TPLFile imagesTPL;
 TPLFile buttonsTPL;
 GXTexObj backdropTexObj;
+GXTlutObj backdropTlutObj;
 GXTexObj gcdvdsmallTexObj;
 GXTexObj sdsmallTexObj;
+GXTlutObj sdsmallTlutObj;
 GXTexObj hddTexObj;
+GXTlutObj hddTlutObj;
 GXTexObj qoobTexObj;
+GXTlutObj qoobTlutObj;
 GXTexObj wodeimgTexObj;
 GXTexObj usbgeckoTexObj;
+GXTlutObj usbgeckoTlutObj;
 GXTexObj memcardTexObj;
+GXTlutObj memcardTlutObj;
 GXTexObj sambaTexObj;
 GXTexObj wiikeyTexObj;
 GXTexObj systemTexObj;
@@ -309,16 +315,22 @@ static void init_textures()
 {
 	TPL_OpenTPLFromMemory(&imagesTPL, (void *)images_tpl, images_tpl_size);
 	TPL_OpenTPLFromMemory(&buttonsTPL, (void *)buttons_tpl, buttons_tpl_size);
-	TPL_GetTexture(&imagesTPL, backdrop, &backdropTexObj);
+	TPL_GetTextureCI(&imagesTPL, backdrop, &backdropTexObj, &backdropTlutObj, GX_TLUT0);
+	GX_InitTexObjUserData(&backdropTexObj, &backdropTlutObj);
 	TPL_GetTexture(&imagesTPL, gcdvdsmall, &gcdvdsmallTexObj);
-	TPL_GetTexture(&imagesTPL, sdsmall, &sdsmallTexObj);
-	TPL_GetTexture(&imagesTPL, hdd, &hddTexObj);
-	TPL_GetTexture(&imagesTPL, qoob, &qoobTexObj);
+	TPL_GetTextureCI(&imagesTPL, sdsmall, &sdsmallTexObj, &sdsmallTlutObj, GX_TLUT0);
+	GX_InitTexObjUserData(&sdsmallTexObj, &sdsmallTlutObj);
+	TPL_GetTextureCI(&imagesTPL, hdd, &hddTexObj, &hddTlutObj, GX_TLUT0);
+	GX_InitTexObjUserData(&hddTexObj, &hddTlutObj);
+	TPL_GetTextureCI(&imagesTPL, qoob, &qoobTexObj, &qoobTlutObj, GX_TLUT0);
+	GX_InitTexObjUserData(&qoobTexObj, &qoobTlutObj);
 	TPL_GetTexture(&imagesTPL, wodeimg, &wodeimgTexObj);
 	TPL_GetTexture(&imagesTPL, wiikeyimg, &wiikeyTexObj);
 	TPL_GetTexture(&imagesTPL, systemimg, &systemTexObj);
-	TPL_GetTexture(&imagesTPL, memcardimg, &memcardTexObj);
-	TPL_GetTexture(&imagesTPL, usbgeckoimg, &usbgeckoTexObj);
+	TPL_GetTextureCI(&imagesTPL, memcardimg, &memcardTexObj, &memcardTlutObj, GX_TLUT0);
+	GX_InitTexObjUserData(&memcardTexObj, &memcardTlutObj);
+	TPL_GetTextureCI(&imagesTPL, usbgeckoimg, &usbgeckoTexObj, &usbgeckoTlutObj, GX_TLUT0);
+	GX_InitTexObjUserData(&usbgeckoTexObj, &usbgeckoTlutObj);
 	TPL_GetTexture(&imagesTPL, sambaimg, &sambaTexObj);
 	TPL_GetTexture(&buttonsTPL, btnhilight, &btnhilightTexObj);
 	TPL_GetTexture(&buttonsTPL, btndevice, &btndeviceTexObj);

cube/swiss/source/images/images.scf

@@ -1,22 +1,22 @@
-<filepath="backdrop.png" id="backdrop" colfmt=3 />
+<filepath="backdrop.tif" id="backdrop" colfmt=9 palfmt=0 />
 <filepath="dir.tif" id="dirimg" colfmt=6 />
 <filepath="dol.tif" id="dolimg" colfmt=6 />
 <filepath="dolcli.tif" id="dolcliimg" colfmt=6 />
 <filepath="elf.tif" id="elfimg" colfmt=6 />
 <filepath="file.tif" id="fileimg" colfmt=6 />
 <filepath="gcdvdsmall.tif" id="gcdvdsmall" colfmt=3 />
 <filepath="gcloader.tif" id="gcloaderimg" colfmt=0 />
-<filepath="hdd.tif" id="hdd" colfmt=3 />
+<filepath="hdd.tif" id="hdd" colfmt=9 palfmt=0 />
 <filepath="m2loader.tif" id="m2loaderimg" colfmt=0 />
-<filepath="memcard.tif" id="memcardimg" colfmt=3 />
+<filepath="memcard.tif" id="memcardimg" colfmt=9 palfmt=0 />
 <filepath="mp3.tif" id="mp3img" colfmt=6 />
 <filepath="ntscj.tif" id="ntscjimg" colfmt=5 />
 <filepath="ntscu.tif" id="ntscuimg" colfmt=5 />
 <filepath="pal.tif" id="palimg" colfmt=5 />
-<filepath="qoob.tif" id="qoob" colfmt=3 />
+<filepath="qoob.tif" id="qoob" colfmt=9 palfmt=0 />
 <filepath="samba.tif" id="sambaimg" colfmt=3 />
-<filepath="sdsmall.tif" id="sdsmall" colfmt=3 />
+<filepath="sdsmall.tif" id="sdsmall" colfmt=9 palfmt=0 />
 <filepath="systemimg.tif" id="systemimg" colfmt=3 />
-<filepath="usbgecko.tif" id="usbgeckoimg" colfmt=3 />
+<filepath="usbgecko.tif" id="usbgeckoimg" colfmt=9 palfmt=0 />
 <filepath="wiikey.tif" id="wiikeyimg" colfmt=0 />
 <filepath="wodeimg.tif" id="wodeimg" colfmt=0 />