diff --git a/Source/Project64-video/Renderer/OGLEScombiner.cpp b/Source/Project64-video/Renderer/OGLEScombiner.cpp index ca3a0f9e2..ea2ba694d 100644 --- a/Source/Project64-video/Renderer/OGLEScombiner.cpp +++ b/Source/Project64-video/Renderer/OGLEScombiner.cpp @@ -1702,8 +1702,7 @@ void setPattern() glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); } -FX_ENTRY void FX_CALL -grStippleMode(GrStippleMode_t mode) +void gfxStippleMode(GrStippleMode_t mode) { WriteTrace(TraceGlitch, TraceDebug, "mode: %d", mode); switch (mode) @@ -1723,7 +1722,7 @@ grStippleMode(GrStippleMode_t mode) glActiveTexture(GL_TEXTURE2); break; default: - WriteTrace(TraceGlitch, TraceWarning, "grStippleMode:%x", mode); + WriteTrace(TraceGlitch, TraceWarning, "gfxStippleMode:%x", mode); } need_to_compile = 1; } diff --git a/Source/Project64-video/Renderer/OGLcombiner.cpp b/Source/Project64-video/Renderer/OGLcombiner.cpp index 89f738754..fe9c8cc7d 100644 --- a/Source/Project64-video/Renderer/OGLcombiner.cpp +++ b/Source/Project64-video/Renderer/OGLcombiner.cpp @@ -1660,8 +1660,7 @@ void setPattern() grDisplayGLError("setPattern"); } -FX_ENTRY void FX_CALL -grStippleMode(GrStippleMode_t mode) +void gfxStippleMode(GrStippleMode_t mode) { WriteTrace(TraceGlitch, TraceDebug, "mode: %d", mode); switch (mode) @@ -1684,11 +1683,11 @@ grStippleMode(GrStippleMode_t mode) glEnable(GL_TEXTURE_2D); break; default: - WriteTrace(TraceGlitch, TraceWarning, "grStippleMode:%x", mode); + WriteTrace(TraceGlitch, TraceWarning, "gfxStippleMode:%x", mode); } need_to_compile = 1; - grDisplayGLError("grStippleMode"); + grDisplayGLError("gfxStippleMode"); } FX_ENTRY void FX_CALL diff --git a/Source/Project64-video/Renderer/Renderer.h b/Source/Project64-video/Renderer/Renderer.h index 59da1b0a7..bd9728855 100644 --- a/Source/Project64-video/Renderer/Renderer.h +++ b/Source/Project64-video/Renderer/Renderer.h @@ -35,6 +35,7 @@ void gfxFogGenerateLinear(float nearZ, float farZ); void gfxFogColorValue(GrColor_t fogcolor); void gfxChromakeyMode(GrChromakeyMode_t mode); void gfxChromakeyValue(GrColor_t value); +void gfxStippleMode(GrStippleMode_t mode); extern uint32_t nbTextureUnits; extern uint32_t g_scr_res_x, g_scr_res_y, g_res_x, g_res_y; diff --git a/Source/Project64-video/Util.cpp b/Source/Project64-video/Util.cpp index fffb73983..f56c78fe5 100644 --- a/Source/Project64-video/Util.cpp +++ b/Source/Project64-video/Util.cpp @@ -1839,17 +1839,17 @@ void update() if (g_settings->old_style_adither() || rdp.alpha_dither_mode != 3) { WriteTrace(TraceRDP, TraceDebug, " |- alpha compare: dither"); - grStippleMode(g_settings->stipple_mode()); + gfxStippleMode(g_settings->stipple_mode()); } else { - grStippleMode(GR_STIPPLE_DISABLE); + gfxStippleMode(GR_STIPPLE_DISABLE); } } else { //WriteTrace(TraceRDP, TraceDebug, " |- alpha compare: dither disabled"); - grStippleMode(GR_STIPPLE_DISABLE); + gfxStippleMode(GR_STIPPLE_DISABLE); } } // Cull mode (leave this in for z-clipped triangles) @@ -1967,7 +1967,7 @@ void set_message_combiner() GR_BLEND_ZERO, GR_BLEND_ZERO); gfxAlphaTestFunction(GR_CMP_ALWAYS); - grStippleMode(GR_STIPPLE_DISABLE); + gfxStippleMode(GR_STIPPLE_DISABLE); grTexFilterMode(0, GR_TEXTUREFILTER_BILINEAR, GR_TEXTUREFILTER_BILINEAR); gfxTexCombine(GR_TMU1, GR_COMBINE_FUNCTION_NONE, diff --git a/Source/Project64-video/rdp.cpp b/Source/Project64-video/rdp.cpp index 7d667299a..3bcdd2a5f 100644 --- a/Source/Project64-video/rdp.cpp +++ b/Source/Project64-video/rdp.cpp @@ -2517,7 +2517,7 @@ void rdp_fillrect() gfxAlphaBlendFunction(GR_BLEND_ONE, GR_BLEND_ZERO, GR_BLEND_ONE, GR_BLEND_ZERO); gfxAlphaTestFunction(GR_CMP_ALWAYS); - grStippleMode(GR_STIPPLE_DISABLE); + gfxStippleMode(GR_STIPPLE_DISABLE); grCullMode(GR_CULL_DISABLE); gfxFogMode(GR_FOG_DISABLE);