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

]Video] Rename GrChromakeyMode_t to gfxChromakeyMode_t

This commit is contained in:
zilmar 2017-07-31 21:28:53 +10:00
parent 27950b4eb1
commit 91cd65b72e
5 changed files with 16 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

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

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

@ -1622,15 +1622,15 @@ void gfxFogColorValue(gfxColor_t fogcolor)
} }
// chroma // chroma
void gfxChromakeyMode(GrChromakeyMode_t mode) void gfxChromakeyMode(gfxChromakeyMode_t mode)
{ {
WriteTrace(TraceGlitch, TraceDebug, "mode: %d", mode); WriteTrace(TraceGlitch, TraceDebug, "mode: %d", mode);
switch (mode) switch (mode)
{ {
case GR_CHROMAKEY_DISABLE: case GFX_CHROMAKEY_DISABLE:
g_chroma_enabled = false; g_chroma_enabled = false;
break; break;
case GR_CHROMAKEY_ENABLE: case GFX_CHROMAKEY_ENABLE:
g_chroma_enabled = true; g_chroma_enabled = true;
break; break;
default: default:

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

@ -1576,15 +1576,15 @@ void gfxFogColorValue(gfxColor_t fogcolor)
} }
// chroma // chroma
void gfxChromakeyMode(GrChromakeyMode_t mode) void gfxChromakeyMode(gfxChromakeyMode_t mode)
{ {
WriteTrace(TraceGlitch, TraceDebug, "mode: %d", mode); WriteTrace(TraceGlitch, TraceDebug, "mode: %d", mode);
switch (mode) switch (mode)
{ {
case GR_CHROMAKEY_DISABLE: case GFX_CHROMAKEY_DISABLE:
chroma_enabled = 0; chroma_enabled = 0;
break; break;
case GR_CHROMAKEY_ENABLE: case GFX_CHROMAKEY_ENABLE:
chroma_enabled = 1; chroma_enabled = 1;
break; break;
default: default:

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

@ -32,7 +32,7 @@ void gfxAlphaTestFunction(gfxCmpFnc_t function);
void gfxFogMode(gfxFogMode_t mode); void gfxFogMode(gfxFogMode_t mode);
void gfxFogGenerateLinear(float nearZ, float farZ); void gfxFogGenerateLinear(float nearZ, float farZ);
void gfxFogColorValue(gfxColor_t fogcolor); void gfxFogColorValue(gfxColor_t fogcolor);
void gfxChromakeyMode(GrChromakeyMode_t mode); void gfxChromakeyMode(gfxChromakeyMode_t mode);
void gfxChromakeyValue(gfxColor_t value); void gfxChromakeyValue(gfxColor_t value);
void gfxStippleMode(GrStippleMode_t mode); void gfxStippleMode(GrStippleMode_t mode);
void gfxColorCombineExt(gfxCCUColor_t a, gfxCombineMode_t a_mode, gfxCCUColor_t b, gfxCombineMode_t b_mode, gfxCCUColor_t c, bool c_invert, gfxCCUColor_t d, bool d_invert, uint32_t shift, bool invert); void gfxColorCombineExt(gfxCCUColor_t a, gfxCombineMode_t a_mode, gfxCCUColor_t b, gfxCombineMode_t b_mode, gfxCCUColor_t c, bool c_invert, gfxCCUColor_t d, bool d_invert, uint32_t shift, bool invert);

6
Source/Project64-video/Renderer/types.h
View File

@ -238,6 +238,12 @@ enum gfxChipID_t
GFX_TMU2 = 0x2, GFX_TMU2 = 0x2,
}; };
enum gfxChromakeyMode_t
{
GFX_CHROMAKEY_DISABLE = 0x0,
GFX_CHROMAKEY_ENABLE = 0x1,
};
typedef struct typedef struct
{ {
gfxLOD_t smallLodLog2; gfxLOD_t smallLodLog2;