diff --git a/Source/Project64-video/Combine.cpp b/Source/Project64-video/Combine.cpp index f1212916c..50cd7fd90 100644 --- a/Source/Project64-video/Combine.cpp +++ b/Source/Project64-video/Combine.cpp @@ -10039,7 +10039,7 @@ static void ac__t0_mul_t1__mul_prim() GFX_COMBINE_LOCAL_CONSTANT, GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); - if (voodoo.sup_large_tex || rdp.tiles(1).lr_s < 256) //hack for RR64 pause screen + if (!g_settings->hacks(CSettings::hack_PPL) || rdp.tiles(1).lr_s < 256) //hack for RR64 pause screen { A_T0_MUL_T1(); } diff --git a/Source/Project64-video/Main.cpp b/Source/Project64-video/Main.cpp index 0bf0aaddc..392d7bc7f 100644 --- a/Source/Project64-video/Main.cpp +++ b/Source/Project64-video/Main.cpp @@ -457,8 +457,6 @@ int InitGfx() to_fullscreen = FALSE; // get maximal texture size - voodoo.sup_large_tex = !g_settings->hacks(CSettings::hack_PPL); - voodoo.tex_min_addr[0] = voodoo.tex_min_addr[1] = gfxTexMinAddress(GFX_TMU0); voodoo.tex_max_addr[0] = voodoo.tex_max_addr[1] = gfxTexMaxAddress(GFX_TMU0); diff --git a/Source/Project64-video/TexCache.cpp b/Source/Project64-video/TexCache.cpp index 07bb57fcd..49f919044 100644 --- a/Source/Project64-video/TexCache.cpp +++ b/Source/Project64-video/TexCache.cpp @@ -263,7 +263,7 @@ void GetTexInfo(int id, int tile) // ** COMMENT THIS TO DISABLE LARGE TEXTURES #ifdef LARGE_TEXTURE_HANDLING - if (!voodoo.sup_large_tex && width > 256) + if (g_settings->hacks(CSettings::hack_PPL) && width > 256) { info->splits = ((width - 1) >> 8) + 1; info->splitheight = rdp.tiles(tile).height; @@ -986,7 +986,7 @@ void LoadTex(int id, gfxChipID_t tmu) uint32_t size_y = rdp.tiles(td).height; // make size_x and size_y both powers of two - if (!voodoo.sup_large_tex) + if (g_settings->hacks(CSettings::hack_PPL)) { if (size_x > 256) size_x = 256; if (size_y > 256) size_y = 256; @@ -1001,9 +1001,9 @@ void LoadTex(int id, gfxChipID_t tmu) // Voodoo 1 support is all here, it will automatically mirror to the full extent. if (!voodoo.sup_mirroring) { - if (rdp.tiles(td).mirror_s && !rdp.tiles(td).clamp_s && (voodoo.sup_large_tex || size_x <= 128)) + if (rdp.tiles(td).mirror_s && !rdp.tiles(td).clamp_s && (!g_settings->hacks(CSettings::hack_PPL) || size_x <= 128)) size_x <<= 1; - if (rdp.tiles(td).mirror_t && !rdp.tiles(td).clamp_t && (voodoo.sup_large_tex || size_y <= 128)) + if (rdp.tiles(td).mirror_t && !rdp.tiles(td).clamp_t && (!g_settings->hacks(CSettings::hack_PPL) || size_y <= 128)) size_y <<= 1; } diff --git a/Source/Project64-video/rdp.h b/Source/Project64-video/rdp.h index 68b0e9670..10d77021a 100644 --- a/Source/Project64-video/rdp.h +++ b/Source/Project64-video/rdp.h @@ -120,7 +120,6 @@ typedef struct { typedef struct { - int sup_large_tex; int sup_mirroring; int sup_32bit_tex; int has_2mb_tex_boundary;