github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 06:13:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed comments on gfx_pc aborts

Browse source
This commit is contained in:
KiritoDev 2022-04-26 17:37:20 -05:00
commit 4b1c6913cb
1 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
View file

@ -834,8 +834,7 @@ static void import_texture(int i, int tile) {
return; return;
} }
if (gfx_texture_cache_lookup(i, tile)) if (gfx_texture_cache_lookup(i, tile)) {
{
return; return;
} }
@ -846,7 +845,7 @@ static void import_texture(int i, int tile) {
} else if (siz == G_IM_SIZ_32b) { } else if (siz == G_IM_SIZ_32b) {
import_texture_rgba32(tile); import_texture_rgba32(tile);
} else { } else {
//abort(); // OTRTODO: Sometimes, seemingly randomly, we end up here. Could be a bad dlist, could be something F3D does not have supported. Further investigation is needed. abort(); // OTRTODO: Sometimes, seemingly randomly, we end up here. Could be a bad dlist, could be something F3D does not have supported. Further investigation is needed.
} }
} else if (fmt == G_IM_FMT_IA) { } else if (fmt == G_IM_FMT_IA) {
if (siz == G_IM_SIZ_4b) { if (siz == G_IM_SIZ_4b) {
@ -856,7 +855,7 @@ static void import_texture(int i, int tile) {
} else if (siz == G_IM_SIZ_16b) { } else if (siz == G_IM_SIZ_16b) {
import_texture_ia16(tile); import_texture_ia16(tile);
} else { } else {
// abort(); abort();
} }
} else if (fmt == G_IM_FMT_CI) { } else if (fmt == G_IM_FMT_CI) {
if (siz == G_IM_SIZ_4b) { if (siz == G_IM_SIZ_4b) {
@ -864,7 +863,7 @@ static void import_texture(int i, int tile) {
} else if (siz == G_IM_SIZ_8b) { } else if (siz == G_IM_SIZ_8b) {
import_texture_ci8(tile); import_texture_ci8(tile);
} else { } else {
// abort(); abort();
} }
} else if (fmt == G_IM_FMT_I) { } else if (fmt == G_IM_FMT_I) {
if (siz == G_IM_SIZ_4b) { if (siz == G_IM_SIZ_4b) {
@ -872,12 +871,13 @@ static void import_texture(int i, int tile) {
} else if (siz == G_IM_SIZ_8b) { } else if (siz == G_IM_SIZ_8b) {
import_texture_i8(tile); import_texture_i8(tile);
} else { } else {
//abort(); abort();
} }
} else {
// abort();
} }
int t1 = get_time();
abort();
// int t1 = get_time();
// printf("Time diff: %d\n", t1 - t0); // printf("Time diff: %d\n", t1 - t0);
} }
@ -2411,9 +2411,6 @@ static void gfx_run_dl(Gfx* cmd) {
char* imgData = (char*)i; char* imgData = (char*)i;
if (strstr(imgData, "spot04_room_0Tex_"))
volatile u32 bla = 0;
if ((i & 0xF0000000) != 0xF0000000) if ((i & 0xF0000000) != 0xF0000000)
if (ResourceMgr_OTRSigCheck(imgData) == 1) if (ResourceMgr_OTRSigCheck(imgData) == 1)
i = (uintptr_t)ResourceMgr_LoadTexByName(imgData); i = (uintptr_t)ResourceMgr_LoadTexByName(imgData);