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

[Video] Rename grChromakeyMode to gfxChromakeyMode

This commit is contained in:
zilmar 2017-05-24 17:59:25 +10:00
parent 28e6369b78
commit 2a76869509
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15668,11 +15668,11 @@ void Combine()
else
{
grChromakeyValue(0);
grChromakeyMode(GR_CHROMAKEY_ENABLE);
gfxChromakeyMode(GR_CHROMAKEY_ENABLE);
}
}
else
grChromakeyMode(GR_CHROMAKEY_DISABLE);
gfxChromakeyMode(GR_CHROMAKEY_DISABLE);
if (aTBuff[0] && aTBuff[0]->info.format == GFX_TEXFMT_ALPHA_INTENSITY_88)
{
@ -15705,7 +15705,7 @@ void Combine()
}
}
else
grChromakeyMode(GR_CHROMAKEY_DISABLE);
gfxChromakeyMode(GR_CHROMAKEY_DISABLE);
cmb.shade_mod_hash = (rdp.cmb_flags + rdp.cmb_flags_2) * (rdp.prim_color + rdp.env_color + rdp.K5);
WriteTrace(TraceRDP, TraceDebug, " | + Combine end");

6
Source/Project64-video/Renderer/OGLEScombiner.cpp
View File

@ -1622,9 +1622,7 @@ void gfxFogColorValue(GrColor_t fogcolor)
}
// chroma
FX_ENTRY void FX_CALL
grChromakeyMode(GrChromakeyMode_t mode)
void gfxChromakeyMode(GrChromakeyMode_t mode)
{
WriteTrace(TraceGlitch, TraceDebug, "mode: %d", mode);
switch (mode)
@ -1636,7 +1634,7 @@ grChromakeyMode(GrChromakeyMode_t mode)
g_chroma_enabled = true;
break;
default:
WriteTrace(TraceGlitch, TraceWarning, "grChromakeyMode : unknown mode : %x", mode);
WriteTrace(TraceGlitch, TraceWarning, "gfxChromakeyMode : unknown mode : %x", mode);
}
need_to_compile = 1;
}

4
Source/Project64-video/Renderer/OGLcombiner.cpp
View File

@ -1575,9 +1575,7 @@ void gfxFogColorValue(GrColor_t fogcolor)
}
// chroma
FX_ENTRY void FX_CALL
grChromakeyMode(GrChromakeyMode_t mode)
void gfxChromakeyMode(GrChromakeyMode_t mode)
{
WriteTrace(TraceGlitch, TraceDebug, "mode: %d", mode);
switch (mode)

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

@ -33,6 +33,7 @@ void gfxAlphaTestFunction(GrCmpFnc_t function);
void gfxFogMode(GrFogMode_t mode);
void gfxFogGenerateLinear(float nearZ, float farZ);
void gfxFogColorValue(GrColor_t fogcolor);
void gfxChromakeyMode(GrChromakeyMode_t mode);
extern uint32_t nbTextureUnits;
extern uint32_t g_scr_res_x, g_scr_res_y, g_res_x, g_res_y;