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

[Video[ Rename grTexDetailControl to gfxTexDetailControl

This commit is contained in:
zilmar 2017-07-20 18:01:37 +10:00
parent e78abaf38d
commit 6b148e8ccb
5 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -700,20 +700,14 @@ void gfxTexSource(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrTexInfo *
} }
} }
FX_ENTRY void FX_CALL void gfxTexDetailControl(GrChipID_t tmu, int lod_bias, FxU8 detail_scale, float detail_max)
grTexDetailControl(
GrChipID_t tmu,
int lod_bias,
FxU8 detail_scale,
float detail_max
)
{ {
WriteTrace(TraceGlitch, TraceDebug, "tmu = %d, lod_bias: %d detail_scale: %d detail_max: %d", tmu, lod_bias, detail_scale, detail_max); WriteTrace(TraceGlitch, TraceDebug, "tmu = %d, lod_bias: %d detail_scale: %d detail_max: %d", tmu, lod_bias, detail_scale, detail_max);
if (lod_bias != 31 && detail_scale != 7) if (lod_bias != 31 && detail_scale != 7)
{ {
if (!lod_bias && !detail_scale && !detail_max) return; if (!lod_bias && !detail_scale && !detail_max) return;
else else
WriteTrace(TraceGlitch, TraceWarning, "grTexDetailControl : %d, %d, %f", lod_bias, detail_scale, detail_max); WriteTrace(TraceGlitch, TraceWarning, "gfxTexDetailControl : %d, %d, %f", lod_bias, detail_scale, detail_max);
} }
lambda = detail_max; lambda = detail_max;
if (lambda > 1.0f) if (lambda > 1.0f)

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

@ -698,20 +698,14 @@ void gfxTexSource(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrTexInfo *
grDisplayGLError("gfxTexSource"); grDisplayGLError("gfxTexSource");
} }
FX_ENTRY void FX_CALL void gfxTexDetailControl(GrChipID_t tmu, int lod_bias, FxU8 detail_scale, float detail_max)
grTexDetailControl(
GrChipID_t tmu,
int lod_bias,
FxU8 detail_scale,
float detail_max
)
{ {
WriteTrace(TraceGlitch, TraceDebug, "tmu = %d, lod_bias: %d detail_scale: %d detail_max: %d", tmu, lod_bias, detail_scale, detail_max); WriteTrace(TraceGlitch, TraceDebug, "tmu = %d, lod_bias: %d detail_scale: %d detail_max: %d", tmu, lod_bias, detail_scale, detail_max);
if (lod_bias != 31 && detail_scale != 7) if (lod_bias != 31 && detail_scale != 7)
{ {
if (!lod_bias && !detail_scale && !detail_max) return; if (!lod_bias && !detail_scale && !detail_max) return;
else else
WriteTrace(TraceGlitch, TraceWarning, "grTexDetailControl : %d, %d, %f", lod_bias, detail_scale, detail_max); WriteTrace(TraceGlitch, TraceWarning, "gfxTexDetailControl : %d, %d, %f", lod_bias, detail_scale, detail_max);
} }
lambda = detail_max; lambda = detail_max;
if (lambda > 1.0f) if (lambda > 1.0f)

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

@ -70,6 +70,7 @@ void gfxGetGammaTableExt(FxU32 /*nentries*/, FxU32 *red, FxU32 *green, FxU32 *bl
void gfxGammaCorrectionRGB(FxFloat gammaR, FxFloat gammaG, FxFloat gammaB); void gfxGammaCorrectionRGB(FxFloat gammaR, FxFloat gammaG, FxFloat gammaB);
void gfxTexDownloadMipMap(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrTexInfo *info); void gfxTexDownloadMipMap(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrTexInfo *info);
void gfxTexSource(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrTexInfo *info); void gfxTexSource(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrTexInfo *info);
void gfxTexDetailControl(GrChipID_t tmu, int lod_bias, FxU8 detail_scale, float detail_max);
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;

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

@ -712,7 +712,7 @@ void TexCache()
gfxConstantColorValueExt(tmu_1, 0); gfxConstantColorValueExt(tmu_1, 0);
} }
} }
grTexDetailControl(tmu_1, cmb.dc1_lodbias, cmb.dc1_detailscale, cmb.dc1_detailmax); gfxTexDetailControl(tmu_1, cmb.dc1_lodbias, cmb.dc1_detailscale, cmb.dc1_detailmax);
grTexLodBiasValue(tmu_1, cmb.lodbias1); grTexLodBiasValue(tmu_1, cmb.lodbias1);
} }
if (tmu_0 < (nbTextureUnits > 2 ? 2 : 1)) if (tmu_0 < (nbTextureUnits > 2 ? 2 : 1))
@ -740,7 +740,7 @@ void TexCache()
gfxConstantColorValueExt(tmu_0, 0); gfxConstantColorValueExt(tmu_0, 0);
} }
} }
grTexDetailControl(tmu_0, cmb.dc0_lodbias, cmb.dc0_detailscale, cmb.dc0_detailmax); gfxTexDetailControl(tmu_0, cmb.dc0_lodbias, cmb.dc0_detailscale, cmb.dc0_detailmax);
grTexLodBiasValue(tmu_0, cmb.lodbias0); grTexLodBiasValue(tmu_0, cmb.lodbias0);
} }
} }

4
Source/Project64-video/Util.cpp
View File

@ -977,9 +977,9 @@ static void CalculateLOD(VERTEX *v, int n)
detailmax = lod_fraction; detailmax = lod_fraction;
else else
detailmax = 1.0f - lod_fraction; detailmax = 1.0f - lod_fraction;
grTexDetailControl(GR_TMU0, cmb.dc0_lodbias, cmb.dc0_detailscale, detailmax); gfxTexDetailControl(GR_TMU0, cmb.dc0_lodbias, cmb.dc0_detailscale, detailmax);
if ((nbTextureUnits > 2 ? 2 : 1) == 2) if ((nbTextureUnits > 2 ? 2 : 1) == 2)
grTexDetailControl(GR_TMU1, cmb.dc1_lodbias, cmb.dc1_detailscale, detailmax); gfxTexDetailControl(GR_TMU1, cmb.dc1_lodbias, cmb.dc1_detailscale, detailmax);
WriteTrace(TraceRDP, TraceDebug, "CalculateLOD factor: %f, tile: %d, lod_fraction: %f", (float)lodFactor, lod_tile, lod_fraction); WriteTrace(TraceRDP, TraceDebug, "CalculateLOD factor: %f, tile: %d, lod_fraction: %f", (float)lodFactor, lod_tile, lod_fraction);
} }