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

[Video] Rename grAlphaTestReferenceValue to gfxAlphaTestReferenceValue

This commit is contained in:
zilmar 2017-05-24 08:30:38 +10:00
parent 2662fc26f8
commit 3279b07699
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1532,8 +1532,7 @@ void gfxAlphaBlendFunction(GrAlphaBlendFnc_t rgb_sf, GrAlphaBlendFnc_t rgb_df, G
glBlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha); glBlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
} }
FX_ENTRY void FX_CALL void gfxAlphaTestReferenceValue(gfxAlpha_t value)
grAlphaTestReferenceValue(gfxAlpha_t value)
{ {
WriteTrace(TraceGlitch, TraceDebug, "value: %d", value); WriteTrace(TraceGlitch, TraceDebug, "value: %d", value);
g_alpha_ref = value; g_alpha_ref = value;

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

@ -1474,8 +1474,7 @@ void gfxAlphaBlendFunction(GrAlphaBlendFnc_t rgb_sf, GrAlphaBlendFnc_t rgb_df, G
grDisplayGLError("gfxAlphaBlendFunction"); grDisplayGLError("gfxAlphaBlendFunction");
} }
FX_ENTRY void FX_CALL void gfxAlphaTestReferenceValue(gfxAlpha_t value)
grAlphaTestReferenceValue(gfxAlpha_t value)
{ {
WriteTrace(TraceGlitch, TraceDebug, "value: %d", value); WriteTrace(TraceGlitch, TraceDebug, "value: %d", value);
alpha_ref = value; alpha_ref = value;

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

@ -28,6 +28,7 @@ void gfxColorCombine(GrCombineFunction_t function, GrCombineFactor_t factor, GrC
void gfxAlphaCombine(GrCombineFunction_t function, GrCombineFactor_t factor, GrCombineLocal_t local, GrCombineOther_t other, FxBool invert); void gfxAlphaCombine(GrCombineFunction_t function, GrCombineFactor_t factor, GrCombineLocal_t local, GrCombineOther_t other, FxBool invert);
void gfxTexCombine(GrChipID_t tmu, GrCombineFunction_t rgb_function, GrCombineFactor_t rgb_factor, GrCombineFunction_t alpha_function, GrCombineFactor_t alpha_factor, FxBool rgb_invert, FxBool alpha_invert); void gfxTexCombine(GrChipID_t tmu, GrCombineFunction_t rgb_function, GrCombineFactor_t rgb_factor, GrCombineFunction_t alpha_function, GrCombineFactor_t alpha_factor, FxBool rgb_invert, FxBool alpha_invert);
void gfxAlphaBlendFunction(GrAlphaBlendFnc_t rgb_sf, GrAlphaBlendFnc_t rgb_df, GrAlphaBlendFnc_t alpha_sf, GrAlphaBlendFnc_t alpha_df); void gfxAlphaBlendFunction(GrAlphaBlendFnc_t rgb_sf, GrAlphaBlendFnc_t rgb_df, GrAlphaBlendFnc_t alpha_sf, GrAlphaBlendFnc_t alpha_df);
void gfxAlphaTestReferenceValue(gfxAlpha_t value);
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;

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

@ -1800,7 +1800,7 @@ void update()
{ {
uint8_t reference = (uint8_t)(rdp.blend_color & 0xFF); uint8_t reference = (uint8_t)(rdp.blend_color & 0xFF);
grAlphaTestFunction(reference ? GR_CMP_GEQUAL : GR_CMP_GREATER); grAlphaTestFunction(reference ? GR_CMP_GEQUAL : GR_CMP_GREATER);
grAlphaTestReferenceValue(reference); gfxAlphaTestReferenceValue(reference);
WriteTrace(TraceRDP, TraceDebug, " |- alpha compare: blend: %02lx", reference); WriteTrace(TraceRDP, TraceDebug, " |- alpha compare: blend: %02lx", reference);
} }
else else
@ -1810,7 +1810,7 @@ void update()
if ((rdp.othermode_l & 0x5000) != 0x5000) if ((rdp.othermode_l & 0x5000) != 0x5000)
{ {
grAlphaTestFunction(GR_CMP_GEQUAL); grAlphaTestFunction(GR_CMP_GEQUAL);
grAlphaTestReferenceValue(0x20);//0xA0); gfxAlphaTestReferenceValue(0x20);//0xA0);
WriteTrace(TraceRDP, TraceDebug, " |- alpha compare: 0x20"); WriteTrace(TraceRDP, TraceDebug, " |- alpha compare: 0x20");
} }
else else
@ -1818,12 +1818,12 @@ void update()
grAlphaTestFunction(GR_CMP_GREATER); grAlphaTestFunction(GR_CMP_GREATER);
if (rdp.acmp == 3) if (rdp.acmp == 3)
{ {
grAlphaTestReferenceValue((uint8_t)(rdp.blend_color & 0xFF)); gfxAlphaTestReferenceValue((uint8_t)(rdp.blend_color & 0xFF));
WriteTrace(TraceRDP, TraceDebug, " |- alpha compare: blend: %02lx", rdp.blend_color & 0xFF); WriteTrace(TraceRDP, TraceDebug, " |- alpha compare: blend: %02lx", rdp.blend_color & 0xFF);
} }
else else
{ {
grAlphaTestReferenceValue(0x00); gfxAlphaTestReferenceValue(0x00);
WriteTrace(TraceRDP, TraceDebug, " |- alpha compare: 0x00"); WriteTrace(TraceRDP, TraceDebug, " |- alpha compare: 0x00");
} }
} }

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

@ -89,7 +89,7 @@ float set_sprite_combine_mode()
if (rdp.othermode_l & 1) if (rdp.othermode_l & 1)
{ {
grAlphaTestFunction(GR_CMP_GEQUAL); grAlphaTestFunction(GR_CMP_GEQUAL);
grAlphaTestReferenceValue(0x80); gfxAlphaTestReferenceValue(0x80);
} }
else else
grAlphaTestFunction(GR_CMP_ALWAYS); grAlphaTestFunction(GR_CMP_ALWAYS);