ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Video] Remove sup_large_tex

This commit is contained in:
zilmar 2017-08-18 17:38:29 +10:00
parent c33e862b8a
commit 5ccae44f43
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64-video/Combine.cpp
View File

@ -10039,7 +10039,7 @@ static void ac__t0_mul_t1__mul_prim()
GFX_COMBINE_LOCAL_CONSTANT, GFX_COMBINE_LOCAL_CONSTANT,
GFX_COMBINE_OTHER_TEXTURE); GFX_COMBINE_OTHER_TEXTURE);
CA_PRIM(); 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(); A_T0_MUL_T1();
} }

2
Source/Project64-video/Main.cpp
View File

@ -457,8 +457,6 @@ int InitGfx()
to_fullscreen = FALSE; to_fullscreen = FALSE;
// get maximal texture size // 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_min_addr[0] = voodoo.tex_min_addr[1] = gfxTexMinAddress(GFX_TMU0);
voodoo.tex_max_addr[0] = voodoo.tex_max_addr[1] = gfxTexMaxAddress(GFX_TMU0); voodoo.tex_max_addr[0] = voodoo.tex_max_addr[1] = gfxTexMaxAddress(GFX_TMU0);

8
Source/Project64-video/TexCache.cpp
View File

@ -263,7 +263,7 @@ void GetTexInfo(int id, int tile)
// ** COMMENT THIS TO DISABLE LARGE TEXTURES // ** COMMENT THIS TO DISABLE LARGE TEXTURES
#ifdef LARGE_TEXTURE_HANDLING #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->splits = ((width - 1) >> 8) + 1;
info->splitheight = rdp.tiles(tile).height; 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; uint32_t size_y = rdp.tiles(td).height;
// make size_x and size_y both powers of two // 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_x > 256) size_x = 256;
if (size_y > 256) size_y = 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. // Voodoo 1 support is all here, it will automatically mirror to the full extent.
if (!voodoo.sup_mirroring) 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; 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; size_y <<= 1;
} }

1
Source/Project64-video/rdp.h
View File

@ -120,7 +120,6 @@ typedef struct {
typedef struct typedef struct
{ {
int sup_large_tex;
int sup_mirroring; int sup_mirroring;
int sup_32bit_tex; int sup_32bit_tex;
int has_2mb_tex_boundary; int has_2mb_tex_boundary;