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

[Video] Remove voodoo.sup_mirroring

This commit is contained in:
zilmar 2017-08-18 17:55:06 +10:00
parent 5ccae44f43
commit ebc1a4397c
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -460,12 +460,6 @@ int InitGfx()
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);
// Is mirroring allowed?
if (!g_settings->hacks(CSettings::hack_Zelda)) //zelda's trees suffer from hardware mirroring
voodoo.sup_mirroring = 1;
else
voodoo.sup_mirroring = 0;
voodoo.sup_32bit_tex = TRUE; voodoo.sup_32bit_tex = TRUE;
voodoo.gamma_correction = 0; voodoo.gamma_correction = 0;
voodoo.gamma_table_size = 256; voodoo.gamma_table_size = 256;
@ -566,10 +560,6 @@ int InitGfx()
DisplayLoadProgress); DisplayLoadProgress);
} }
} }
if (g_ghq_use)
{
voodoo.sup_mirroring = 1;
}
return TRUE; return TRUE;
} }

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

@ -849,7 +849,7 @@ void TexCache()
mode_s = GFX_TEXTURECLAMP_CLAMP; mode_s = GFX_TEXTURECLAMP_CLAMP;
else else
{ {
if (rdp.tiles(tile).mirror_s && voodoo.sup_mirroring) if (rdp.tiles(tile).mirror_s && !g_settings->hacks(CSettings::hack_Zelda))
mode_s = GFX_TEXTURECLAMP_MIRROR_EXT; mode_s = GFX_TEXTURECLAMP_MIRROR_EXT;
else else
mode_s = GFX_TEXTURECLAMP_WRAP; mode_s = GFX_TEXTURECLAMP_WRAP;
@ -863,7 +863,7 @@ void TexCache()
mode_t = GFX_TEXTURECLAMP_CLAMP; mode_t = GFX_TEXTURECLAMP_CLAMP;
else else
{ {
if (rdp.tiles(tile).mirror_t && voodoo.sup_mirroring) if (rdp.tiles(tile).mirror_t && !g_settings->hacks(CSettings::hack_Zelda))
mode_t = GFX_TEXTURECLAMP_MIRROR_EXT; mode_t = GFX_TEXTURECLAMP_MIRROR_EXT;
else else
mode_t = GFX_TEXTURECLAMP_WRAP; mode_t = GFX_TEXTURECLAMP_WRAP;
@ -998,8 +998,7 @@ void LoadTex(int id, gfxChipID_t tmu)
for (shift = 0; (1 << shift) < (int)size_y; shift++); for (shift = 0; (1 << shift) < (int)size_y; shift++);
size_y = 1 << shift; size_y = 1 << shift;
// Voodoo 1 support is all here, it will automatically mirror to the full extent. if (g_settings->hacks(CSettings::hack_Zelda))
if (!voodoo.sup_mirroring)
{ {
if (rdp.tiles(td).mirror_s && !rdp.tiles(td).clamp_s && (!g_settings->hacks(CSettings::hack_PPL) || 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;
@ -1604,7 +1603,7 @@ void LoadTex(int id, gfxChipID_t tmu)
cache->c_scl_y /= splits; cache->c_scl_y /= splits;
} }
} }
if (voodoo.sup_mirroring) if (!g_settings->hacks(CSettings::hack_Zelda))
{ {
if (rdp.tiles(td).mirror_s && texinfo[id].tile_width == 2 * texinfo[id].width) if (rdp.tiles(td).mirror_s && texinfo[id].tile_width == 2 * texinfo[id].width)
cache->f_mirror_s = TRUE; cache->f_mirror_s = TRUE;

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

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