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

[Video] Renamme guGammaCorrectionRGB to gfxGammaCorrectionRGB

This commit is contained in:
zilmar 2017-07-20 17:47:25 +10:00
parent f4b3678773
commit b0b28adad7
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -640,7 +640,7 @@ void ReleaseGfx()
if (voodoo.gamma_table_r) if (voodoo.gamma_table_r)
gfxLoadGammaTable(voodoo.gamma_table_size, voodoo.gamma_table_r, voodoo.gamma_table_g, voodoo.gamma_table_b); gfxLoadGammaTable(voodoo.gamma_table_size, voodoo.gamma_table_r, voodoo.gamma_table_g, voodoo.gamma_table_b);
else else
guGammaCorrectionRGB(1.3f, 1.3f, 1.3f); //1.3f is default 3dfx gamma for everything but desktop gfxGammaCorrectionRGB(1.3f, 1.3f, 1.3f); //1.3f is default 3dfx gamma for everything but desktop
voodoo.gamma_correction = 0; voodoo.gamma_correction = 0;
} }
@ -1416,7 +1416,7 @@ void newSwapBuffers()
{ {
if (voodoo.gamma_table_size && !voodoo.gamma_table_r) if (voodoo.gamma_table_size && !voodoo.gamma_table_r)
GetGammaTable(); //save initial gamma tables GetGammaTable(); //save initial gamma tables
guGammaCorrectionRGB(2.0f, 2.0f, 2.0f); //with gamma=2.0 gamma table is the same, as in N64 gfxGammaCorrectionRGB(2.0f, 2.0f, 2.0f); //with gamma=2.0 gamma table is the same, as in N64
voodoo.gamma_correction = 1; voodoo.gamma_correction = 1;
} }
} }
@ -1427,7 +1427,7 @@ void newSwapBuffers()
if (voodoo.gamma_table_r) if (voodoo.gamma_table_r)
gfxLoadGammaTable(voodoo.gamma_table_size, voodoo.gamma_table_r, voodoo.gamma_table_g, voodoo.gamma_table_b); gfxLoadGammaTable(voodoo.gamma_table_size, voodoo.gamma_table_r, voodoo.gamma_table_g, voodoo.gamma_table_b);
else else
guGammaCorrectionRGB(1.3f, 1.3f, 1.3f); //1.3f is default 3dfx gamma for everything but desktop gfxGammaCorrectionRGB(1.3f, 1.3f, 1.3f); //1.3f is default 3dfx gamma for everything but desktop
voodoo.gamma_correction = 0; voodoo.gamma_correction = 0;
} }
} }

5
Source/Project64-video/Renderer/OGLESglitchmain.cpp
View File

@ -1706,12 +1706,11 @@ void gfxGetGammaTableExt(FxU32 nentries, FxU32 *red, FxU32 *green, FxU32 *blue)
*/ */
} }
FX_ENTRY void FX_CALL void gfxGammaCorrectionRGB(FxFloat gammaR, FxFloat gammaG, FxFloat gammaB)
guGammaCorrectionRGB(FxFloat gammaR, FxFloat gammaG, FxFloat gammaB)
{ {
//TODO? //TODO?
/* /*
LOG("guGammaCorrectionRGB()\r\n"); LOG("gfxGammaCorrectionRGB()\r\n");
if (!fullscreen) if (!fullscreen)
return; return;
FxU16 aGammaRamp[3][256]; FxU16 aGammaRamp[3][256];

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

@ -1999,8 +1999,7 @@ void gfxGetGammaTableExt(FxU32 /*nentries*/, FxU32 *red, FxU32 *green, FxU32 *bl
} }
} }
FX_ENTRY void FX_CALL void gfxGammaCorrectionRGB(FxFloat gammaR, FxFloat gammaG, FxFloat gammaB)
guGammaCorrectionRGB(FxFloat gammaR, FxFloat gammaG, FxFloat gammaB)
{ {
WriteTrace(TraceGlitch, TraceDebug, "-"); WriteTrace(TraceGlitch, TraceDebug, "-");

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

@ -67,6 +67,7 @@ FxU32 gfxTexCalcMemRequired(GrLOD_t lodmin, GrLOD_t lodmax, GrAspectRatio_t aspe
void gfxEnable(GrEnableMode_t mode); void gfxEnable(GrEnableMode_t mode);
void gfxLoadGammaTable(FxU32 nentries, FxU32 *red, FxU32 *green, FxU32 *blue); void gfxLoadGammaTable(FxU32 nentries, FxU32 *red, FxU32 *green, FxU32 *blue);
void gfxGetGammaTableExt(FxU32 /*nentries*/, FxU32 *red, FxU32 *green, FxU32 *blue); void gfxGetGammaTableExt(FxU32 /*nentries*/, FxU32 *red, FxU32 *green, FxU32 *blue);
void gfxGammaCorrectionRGB(FxFloat gammaR, FxFloat gammaG, FxFloat gammaB);
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;