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

[Video] Rename grStippleMode to gfxStippleMode

This commit is contained in:
zilmar 2017-05-24 18:14:54 +10:00
parent 1a43514df1
commit 938cd4e7c8
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1702,8 +1702,7 @@ void setPattern()
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
} }
FX_ENTRY void FX_CALL void gfxStippleMode(GrStippleMode_t mode)
grStippleMode(GrStippleMode_t mode)
{ {
WriteTrace(TraceGlitch, TraceDebug, "mode: %d", mode); WriteTrace(TraceGlitch, TraceDebug, "mode: %d", mode);
switch (mode) switch (mode)
@ -1723,7 +1722,7 @@ grStippleMode(GrStippleMode_t mode)
glActiveTexture(GL_TEXTURE2); glActiveTexture(GL_TEXTURE2);
break; break;
default: default:
WriteTrace(TraceGlitch, TraceWarning, "grStippleMode:%x", mode); WriteTrace(TraceGlitch, TraceWarning, "gfxStippleMode:%x", mode);
} }
need_to_compile = 1; need_to_compile = 1;
} }

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

@ -1660,8 +1660,7 @@ void setPattern()
grDisplayGLError("setPattern"); grDisplayGLError("setPattern");
} }
FX_ENTRY void FX_CALL void gfxStippleMode(GrStippleMode_t mode)
grStippleMode(GrStippleMode_t mode)
{ {
WriteTrace(TraceGlitch, TraceDebug, "mode: %d", mode); WriteTrace(TraceGlitch, TraceDebug, "mode: %d", mode);
switch (mode) switch (mode)
@ -1684,11 +1683,11 @@ grStippleMode(GrStippleMode_t mode)
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
break; break;
default: default:
WriteTrace(TraceGlitch, TraceWarning, "grStippleMode:%x", mode); WriteTrace(TraceGlitch, TraceWarning, "gfxStippleMode:%x", mode);
} }
need_to_compile = 1; need_to_compile = 1;
grDisplayGLError("grStippleMode"); grDisplayGLError("gfxStippleMode");
} }
FX_ENTRY void FX_CALL FX_ENTRY void FX_CALL

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

@ -35,6 +35,7 @@ void gfxFogGenerateLinear(float nearZ, float farZ);
void gfxFogColorValue(GrColor_t fogcolor); void gfxFogColorValue(GrColor_t fogcolor);
void gfxChromakeyMode(GrChromakeyMode_t mode); void gfxChromakeyMode(GrChromakeyMode_t mode);
void gfxChromakeyValue(GrColor_t value); void gfxChromakeyValue(GrColor_t value);
void gfxStippleMode(GrStippleMode_t mode);
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

@ -1839,17 +1839,17 @@ void update()
if (g_settings->old_style_adither() || rdp.alpha_dither_mode != 3) if (g_settings->old_style_adither() || rdp.alpha_dither_mode != 3)
{ {
WriteTrace(TraceRDP, TraceDebug, " |- alpha compare: dither"); WriteTrace(TraceRDP, TraceDebug, " |- alpha compare: dither");
grStippleMode(g_settings->stipple_mode()); gfxStippleMode(g_settings->stipple_mode());
} }
else else
{ {
grStippleMode(GR_STIPPLE_DISABLE); gfxStippleMode(GR_STIPPLE_DISABLE);
} }
} }
else else
{ {
//WriteTrace(TraceRDP, TraceDebug, " |- alpha compare: dither disabled"); //WriteTrace(TraceRDP, TraceDebug, " |- alpha compare: dither disabled");
grStippleMode(GR_STIPPLE_DISABLE); gfxStippleMode(GR_STIPPLE_DISABLE);
} }
} }
// Cull mode (leave this in for z-clipped triangles) // Cull mode (leave this in for z-clipped triangles)
@ -1967,7 +1967,7 @@ void set_message_combiner()
GR_BLEND_ZERO, GR_BLEND_ZERO,
GR_BLEND_ZERO); GR_BLEND_ZERO);
gfxAlphaTestFunction(GR_CMP_ALWAYS); gfxAlphaTestFunction(GR_CMP_ALWAYS);
grStippleMode(GR_STIPPLE_DISABLE); gfxStippleMode(GR_STIPPLE_DISABLE);
grTexFilterMode(0, GR_TEXTUREFILTER_BILINEAR, GR_TEXTUREFILTER_BILINEAR); grTexFilterMode(0, GR_TEXTUREFILTER_BILINEAR, GR_TEXTUREFILTER_BILINEAR);
gfxTexCombine(GR_TMU1, gfxTexCombine(GR_TMU1,
GR_COMBINE_FUNCTION_NONE, GR_COMBINE_FUNCTION_NONE,

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

@ -2517,7 +2517,7 @@ void rdp_fillrect()
gfxAlphaBlendFunction(GR_BLEND_ONE, GR_BLEND_ZERO, GR_BLEND_ONE, GR_BLEND_ZERO); gfxAlphaBlendFunction(GR_BLEND_ONE, GR_BLEND_ZERO, GR_BLEND_ONE, GR_BLEND_ZERO);
gfxAlphaTestFunction(GR_CMP_ALWAYS); gfxAlphaTestFunction(GR_CMP_ALWAYS);
grStippleMode(GR_STIPPLE_DISABLE); gfxStippleMode(GR_STIPPLE_DISABLE);
grCullMode(GR_CULL_DISABLE); grCullMode(GR_CULL_DISABLE);
gfxFogMode(GR_FOG_DISABLE); gfxFogMode(GR_FOG_DISABLE);