diff --git a/Source/Project64-video/Renderer/OGLEScombiner.cpp b/Source/Project64-video/Renderer/OGLEScombiner.cpp
index f8df7ac02..f8a99ffc1 100644
--- a/Source/Project64-video/Renderer/OGLEScombiner.cpp
+++ b/Source/Project64-video/Renderer/OGLEScombiner.cpp
@@ -2688,7 +2688,7 @@ void gfxTexAlphaCombineExt(GrChipID_t tmu, GrTACUColor_t a, GrCombineMode_t a_mo
     need_to_compile = 1;
 }
 
-FX_ENTRY void FX_CALL grConstantColorValueExt(GrChipID_t tmu, GrColor_t value)
+void gfxConstantColorValueExt(GrChipID_t tmu, GrColor_t value)
 {
     int num_tex;
     WriteTrace(TraceGlitch, TraceDebug, "tmu: %d value: %d", tmu, value);
diff --git a/Source/Project64-video/Renderer/OGLcombiner.cpp b/Source/Project64-video/Renderer/OGLcombiner.cpp
index 0e48f3254..53f006080 100644
--- a/Source/Project64-video/Renderer/OGLcombiner.cpp
+++ b/Source/Project64-video/Renderer/OGLcombiner.cpp
@@ -2651,9 +2651,7 @@ void gfxTexAlphaCombineExt(GrChipID_t tmu, GrTACUColor_t a, GrCombineMode_t a_mo
     need_to_compile = 1;
 }
 
-FX_ENTRY void FX_CALL
-grConstantColorValueExt(GrChipID_t    tmu,
-    GrColor_t     value)
+void gfxConstantColorValueExt(GrChipID_t tmu, GrColor_t value)
 {
     int num_tex;
     WriteTrace(TraceGlitch, TraceDebug, "tmu: %d value: %d", tmu, value);
@@ -2709,5 +2707,5 @@ grConstantColorValueExt(GrChipID_t    tmu,
         ccolor1_location = glGetUniformLocationARB(program_object, "ccolor1");
         glUniform4fARB(ccolor1_location, ccolor1[0], ccolor1[1], ccolor1[2], ccolor1[3]);
     }
-    grDisplayGLError("grConstantColorValueExt");
+    grDisplayGLError("gfxConstantColorValueExt");
 }
\ No newline at end of file
diff --git a/Source/Project64-video/Renderer/Renderer.h b/Source/Project64-video/Renderer/Renderer.h
index 9b8346149..4c851c6fc 100644
--- a/Source/Project64-video/Renderer/Renderer.h
+++ b/Source/Project64-video/Renderer/Renderer.h
@@ -40,6 +40,7 @@ void gfxColorCombineExt(GrCCUColor_t a, GrCombineMode_t a_mode, GrCCUColor_t b,
 void gfxAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode, GrACUColor_t b, GrCombineMode_t b_mode, GrACUColor_t c, FxBool c_invert, GrACUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert);
 void gfxTexColorCombineExt(GrChipID_t tmu, GrTCCUColor_t a, GrCombineMode_t a_mode, GrTCCUColor_t b, GrCombineMode_t b_mode, GrTCCUColor_t c, FxBool c_invert, GrTCCUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert);
 void gfxTexAlphaCombineExt(GrChipID_t tmu, GrTACUColor_t a, GrCombineMode_t a_mode, GrTACUColor_t b, GrCombineMode_t b_mode, GrTACUColor_t c, FxBool c_invert, GrTACUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert);
+void gfxConstantColorValueExt(GrChipID_t tmu, GrColor_t value);
 
 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/TexCache.cpp b/Source/Project64-video/TexCache.cpp
index b0d5c01db..363e9915e 100644
--- a/Source/Project64-video/TexCache.cpp
+++ b/Source/Project64-video/TexCache.cpp
@@ -702,14 +702,14 @@ void TexCache()
                     TexAlphaCombinerToExtension(GR_TMU1);
                 gfxTexColorCombineExt(tmu_1, cmb.t1c_ext_a, cmb.t1c_ext_a_mode, cmb.t1c_ext_b, cmb.t1c_ext_b_mode, cmb.t1c_ext_c, cmb.t1c_ext_c_invert, cmb.t1c_ext_d, cmb.t1c_ext_d_invert, 0, 0);
                 gfxTexAlphaCombineExt(tmu_1, cmb.t1a_ext_a, cmb.t1a_ext_a_mode, cmb.t1a_ext_b, cmb.t1a_ext_b_mode, cmb.t1a_ext_c, cmb.t1a_ext_c_invert, cmb.t1a_ext_d, cmb.t1a_ext_d_invert, 0, 0);
-                grConstantColorValueExt(tmu_1, cmb.tex_ccolor);
+                gfxConstantColorValueExt(tmu_1, cmb.tex_ccolor);
             }
             else
             {
                 gfxTexCombine(tmu_1, cmb.tmu1_func, cmb.tmu1_fac, cmb.tmu1_a_func, cmb.tmu1_a_fac, cmb.tmu1_invert, cmb.tmu1_a_invert);
                 if (cmb.combine_ext)
                 {
-                    grConstantColorValueExt(tmu_1, 0);
+                    gfxConstantColorValueExt(tmu_1, 0);
                 }
             }
             grTexDetailControl(tmu_1, cmb.dc1_lodbias, cmb.dc1_detailscale, cmb.dc1_detailmax);
@@ -730,14 +730,14 @@ void TexCache()
                 }
                 gfxTexColorCombineExt(tmu_0, cmb.t0c_ext_a, cmb.t0c_ext_a_mode, cmb.t0c_ext_b, cmb.t0c_ext_b_mode, cmb.t0c_ext_c, cmb.t0c_ext_c_invert, cmb.t0c_ext_d, cmb.t0c_ext_d_invert, 0, 0);
                 gfxTexAlphaCombineExt(tmu_0, cmb.t0a_ext_a, cmb.t0a_ext_a_mode, cmb.t0a_ext_b, cmb.t0a_ext_b_mode, cmb.t0a_ext_c, cmb.t0a_ext_c_invert, cmb.t0a_ext_d, cmb.t0a_ext_d_invert, 0, 0);
-                grConstantColorValueExt(tmu_0, cmb.tex_ccolor);
+                gfxConstantColorValueExt(tmu_0, cmb.tex_ccolor);
             }
             else
             {
                 gfxTexCombine(tmu_0, cmb.tmu0_func, cmb.tmu0_fac, cmb.tmu0_a_func, cmb.tmu0_a_fac, cmb.tmu0_invert, cmb.tmu0_a_invert);
                 if (cmb.combine_ext)
                 {
-                    grConstantColorValueExt(tmu_0, 0);
+                    gfxConstantColorValueExt(tmu_0, 0);
                 }
             }
             grTexDetailControl(tmu_0, cmb.dc0_lodbias, cmb.dc0_detailscale, cmb.dc0_detailmax);