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

[Video] Rename grTexMaxAddress to gfxTexMaxAddress

This commit is contained in:
zilmar 2017-05-23 17:26:00 +10:00
parent 67a60f14ec
commit d5942628e9
4 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -497,7 +497,7 @@ int InitGfx()
voodoo.sup_large_tex = (voodoo.max_tex_size > 256 && !g_settings->hacks(CSettings::hack_PPL)); voodoo.sup_large_tex = (voodoo.max_tex_size > 256 && !g_settings->hacks(CSettings::hack_PPL));
voodoo.tex_min_addr[0] = voodoo.tex_min_addr[1] = gfxTexMinAddress(GR_TMU0); voodoo.tex_min_addr[0] = voodoo.tex_min_addr[1] = gfxTexMinAddress(GR_TMU0);
voodoo.tex_max_addr[0] = voodoo.tex_max_addr[1] = grTexMaxAddress(GR_TMU0); voodoo.tex_max_addr[0] = voodoo.tex_max_addr[1] = gfxTexMaxAddress(GR_TMU0);
// Is mirroring allowed? // Is mirroring allowed?
if (!g_settings->hacks(CSettings::hack_Zelda)) //zelda's trees suffer from hardware mirroring if (!g_settings->hacks(CSettings::hack_Zelda)) //zelda's trees suffer from hardware mirroring

3
Source/Project64-video/Renderer/OGLEStextures.cpp
View File

@ -147,8 +147,7 @@ FxU32 gfxTexMinAddress(GrChipID_t tmu)
return tmu*TMU_SIZE; return tmu*TMU_SIZE;
} }
FX_ENTRY FxU32 FX_CALL FxU32 gfxTexMaxAddress(GrChipID_t tmu)
grTexMaxAddress(GrChipID_t tmu)
{ {
WriteTrace(TraceGlitch, TraceDebug, "tmu = %d", tmu); WriteTrace(TraceGlitch, TraceDebug, "tmu = %d", tmu);
if (UMAmode) if (UMAmode)

12
Source/Project64-video/Renderer/OGLtextures.cpp
View File

@ -148,8 +148,7 @@ FxU32 gfxTexMinAddress(GrChipID_t tmu)
return tmu*TMU_SIZE; return tmu*TMU_SIZE;
} }
FX_ENTRY FxU32 FX_CALL FxU32 gfxTexMaxAddress(GrChipID_t tmu)
grTexMaxAddress(GrChipID_t tmu)
{ {
WriteTrace(TraceGlitch, TraceDebug, "tmu = %d", tmu); WriteTrace(TraceGlitch, TraceDebug, "tmu = %d", tmu);
if (UMAmode) if (UMAmode)
@ -709,15 +708,6 @@ grTexSource(GrChipID_t tmu,
need_to_compile = 1; need_to_compile = 1;
} }
} }
#if 0
extern int auxbuffer;
static int oldbuffer;
FX_ENTRY void FX_CALL grAuxBufferExt(GrBuffer_t buffer);
if (auxbuffer == GR_BUFFER_AUXBUFFER && auxbuffer != oldbuffer)
grAuxBufferExt(auxbuffer);
oldbuffer = auxbuffer;
#endif
grDisplayGLError("grTexSource"); grDisplayGLError("grTexSource");
} }

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

@ -21,6 +21,7 @@ void gfxColorMask(FxBool rgb, FxBool a);
FxU32 gfxTexMinAddress(GrChipID_t tmu); FxU32 gfxTexMinAddress(GrChipID_t tmu);
FxBool gfxSstWinClose(GrContext_t context); FxBool gfxSstWinClose(GrContext_t context);
void gfxTextureBufferExt(GrChipID_t tmu, FxU32 startAddress, GrLOD_t lodmin, GrLOD_t lodmax, GrAspectRatio_t aspect, GrTextureFormat_t fmt, FxU32 evenOdd); void gfxTextureBufferExt(GrChipID_t tmu, FxU32 startAddress, GrLOD_t lodmin, GrLOD_t lodmax, GrAspectRatio_t aspect, GrTextureFormat_t fmt, FxU32 evenOdd);
FxU32 gfxTexMaxAddress(GrChipID_t tmu);
extern uint32_t nbTextureUnits; extern uint32_t nbTextureUnits;
extern uint32_t g_scr_res_x, g_scr_res_y, g_res_x, g_res_y; extern uint32_t g_scr_res_x, g_scr_res_y, g_res_x, g_res_y;