diff --git a/Source/Project64-video/Renderer/OGLEScombiner.cpp b/Source/Project64-video/Renderer/OGLEScombiner.cpp
index 32365d4c2..f8df7ac02 100644
--- a/Source/Project64-video/Renderer/OGLEScombiner.cpp
+++ b/Source/Project64-video/Renderer/OGLEScombiner.cpp
@@ -2410,19 +2410,13 @@ void gfxTexColorCombineExt(GrChipID_t tmu, GrTCCUColor_t a, GrCombineMode_t a_mo
     need_to_compile = 1;
 }
 
-FX_ENTRY void FX_CALL
-grTexAlphaCombineExt(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 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)
 {
     int num_tex;
     WriteTrace(TraceGlitch, TraceDebug, "tmu: %d a: %d a_mode: %d b: %d b_mode: %d c: %d c_invert: %d d: %d d_invert: %d shift, invert: %d", tmu, a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert);
 
-    if (invert) WriteTrace(TraceGlitch, TraceWarning, "grTexAlphaCombineExt : inverted result");
-    if (shift) WriteTrace(TraceGlitch, TraceWarning, "grTexAlphaCombineExt : shift = %d", shift);
+    if (invert) WriteTrace(TraceGlitch, TraceWarning, "gfxTexAlphaCombineExt : inverted result");
+    if (shift) WriteTrace(TraceGlitch, TraceWarning, "gfxTexAlphaCombineExt : shift = %d", shift);
 
     if (tmu == GR_TMU0) num_tex = 1;
     else num_tex = 0;
@@ -2469,7 +2463,7 @@ grTexAlphaCombineExt(GrChipID_t       tmu,
             strcat(fragment_shader_texture1, "ctex1s_a.a = ccolor1.a; \n");
         break;
     default:
-        WriteTrace(TraceGlitch, TraceWarning, "grTexAlphaCombineExt : a = %x", a);
+        WriteTrace(TraceGlitch, TraceWarning, "gfxTexAlphaCombineExt : a = %x", a);
         if (num_tex == 0)
             strcat(fragment_shader_texture0, "ctex0s_a.a = 0.0; \n");
         else
@@ -2503,7 +2497,7 @@ grTexAlphaCombineExt(GrChipID_t       tmu,
             strcat(fragment_shader_texture1, "ctex1_a.a = -ctex1s_a.a; \n");
         break;
     default:
-        WriteTrace(TraceGlitch, TraceWarning, "grTexAlphaCombineExt : a_mode = %x", a_mode);
+        WriteTrace(TraceGlitch, TraceWarning, "gfxTexAlphaCombineExt : a_mode = %x", a_mode);
         if (num_tex == 0)
             strcat(fragment_shader_texture0, "ctex0_a.a = 0.0; \n");
         else
@@ -2537,7 +2531,7 @@ grTexAlphaCombineExt(GrChipID_t       tmu,
             strcat(fragment_shader_texture1, "ctex1s_b.a = ccolor1.a; \n");
         break;
     default:
-        WriteTrace(TraceGlitch, TraceWarning, "grTexAlphaCombineExt : b = %x", b);
+        WriteTrace(TraceGlitch, TraceWarning, "gfxTexAlphaCombineExt : b = %x", b);
         if (num_tex == 0)
             strcat(fragment_shader_texture0, "ctex0s_b.a = 0.0; \n");
         else
@@ -2571,7 +2565,7 @@ grTexAlphaCombineExt(GrChipID_t       tmu,
             strcat(fragment_shader_texture1, "ctex1_b.a = -ctex1s_b.a; \n");
         break;
     default:
-        WriteTrace(TraceGlitch, TraceWarning, "grTexAlphaCombineExt : b_mode = %x", b_mode);
+        WriteTrace(TraceGlitch, TraceWarning, "gfxTexAlphaCombineExt : b_mode = %x", b_mode);
         if (num_tex == 0)
             strcat(fragment_shader_texture0, "ctex0_b.a = 0.0; \n");
         else
@@ -2623,7 +2617,7 @@ grTexAlphaCombineExt(GrChipID_t       tmu,
             strcat(fragment_shader_texture1, "ctex1_c.a = ccolor1.a; \n");
         break;
     default:
-        WriteTrace(TraceGlitch, TraceWarning, "grTexAlphaCombineExt : c = %x", c);
+        WriteTrace(TraceGlitch, TraceWarning, "gfxTexAlphaCombineExt : c = %x", c);
         if (num_tex == 0)
             strcat(fragment_shader_texture0, "ctex0_c.a = 0.0; \n");
         else
@@ -2671,7 +2665,7 @@ grTexAlphaCombineExt(GrChipID_t       tmu,
             strcat(fragment_shader_texture1, "ctex1_d.a = readtex1.a; \n");
         break;
     default:
-        WriteTrace(TraceGlitch, TraceWarning, "grTexAlphaCombineExt : d = %x", d);
+        WriteTrace(TraceGlitch, TraceWarning, "gfxTexAlphaCombineExt : d = %x", d);
         if (num_tex == 0)
             strcat(fragment_shader_texture0, "ctex0_d.a = 0.0; \n");
         else
diff --git a/Source/Project64-video/Renderer/OGLcombiner.cpp b/Source/Project64-video/Renderer/OGLcombiner.cpp
index 1192eddb7..0e48f3254 100644
--- a/Source/Project64-video/Renderer/OGLcombiner.cpp
+++ b/Source/Project64-video/Renderer/OGLcombiner.cpp
@@ -2373,19 +2373,13 @@ void gfxTexColorCombineExt(GrChipID_t tmu, GrTCCUColor_t a, GrCombineMode_t a_mo
     need_to_compile = 1;
 }
 
-FX_ENTRY void FX_CALL
-grTexAlphaCombineExt(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 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)
 {
     int num_tex;
     WriteTrace(TraceGlitch, TraceDebug, "tmu: %d a: %d a_mode: %d b: %d b_mode: %d c: %d c_invert: %d d: %d d_invert: %d shift, invert: %d", tmu, a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert);
 
-    if (invert) WriteTrace(TraceGlitch, TraceWarning, "grTexAlphaCombineExt : inverted result");
-    if (shift) WriteTrace(TraceGlitch, TraceWarning, "grTexAlphaCombineExt : shift = %d", shift);
+    if (invert) WriteTrace(TraceGlitch, TraceWarning, "gfxTexAlphaCombineExt : inverted result");
+    if (shift) WriteTrace(TraceGlitch, TraceWarning, "gfxTexAlphaCombineExt : shift = %d", shift);
 
     if (tmu == GR_TMU0) num_tex = 1;
     else num_tex = 0;
@@ -2432,7 +2426,7 @@ grTexAlphaCombineExt(GrChipID_t       tmu,
             strcat(fragment_shader_texture1, "ctex1s_a.a = ccolor1.a; \n");
         break;
     default:
-        WriteTrace(TraceGlitch, TraceWarning, "grTexAlphaCombineExt : a = %x", a);
+        WriteTrace(TraceGlitch, TraceWarning, "gfxTexAlphaCombineExt : a = %x", a);
         if (num_tex == 0)
             strcat(fragment_shader_texture0, "ctex0s_a.a = 0.0; \n");
         else
@@ -2466,7 +2460,7 @@ grTexAlphaCombineExt(GrChipID_t       tmu,
             strcat(fragment_shader_texture1, "ctex1_a.a = -ctex1s_a.a; \n");
         break;
     default:
-        WriteTrace(TraceGlitch, TraceWarning, "grTexAlphaCombineExt : a_mode = %x", a_mode);
+        WriteTrace(TraceGlitch, TraceWarning, "gfxTexAlphaCombineExt : a_mode = %x", a_mode);
         if (num_tex == 0)
             strcat(fragment_shader_texture0, "ctex0_a.a = 0.0; \n");
         else
@@ -2500,7 +2494,7 @@ grTexAlphaCombineExt(GrChipID_t       tmu,
             strcat(fragment_shader_texture1, "ctex1s_b.a = ccolor1.a; \n");
         break;
     default:
-        WriteTrace(TraceGlitch, TraceWarning, "grTexAlphaCombineExt : b = %x", b);
+        WriteTrace(TraceGlitch, TraceWarning, "gfxTexAlphaCombineExt : b = %x", b);
         if (num_tex == 0)
             strcat(fragment_shader_texture0, "ctex0s_b.a = 0.0; \n");
         else
@@ -2534,7 +2528,7 @@ grTexAlphaCombineExt(GrChipID_t       tmu,
             strcat(fragment_shader_texture1, "ctex1_b.a = -ctex1s_b.a; \n");
         break;
     default:
-        WriteTrace(TraceGlitch, TraceWarning, "grTexAlphaCombineExt : b_mode = %x", b_mode);
+        WriteTrace(TraceGlitch, TraceWarning, "gfxTexAlphaCombineExt : b_mode = %x", b_mode);
         if (num_tex == 0)
             strcat(fragment_shader_texture0, "ctex0_b.a = 0.0; \n");
         else
@@ -2586,7 +2580,7 @@ grTexAlphaCombineExt(GrChipID_t       tmu,
             strcat(fragment_shader_texture1, "ctex1_c.a = ccolor1.a; \n");
         break;
     default:
-        WriteTrace(TraceGlitch, TraceWarning, "grTexAlphaCombineExt : c = %x", c);
+        WriteTrace(TraceGlitch, TraceWarning, "gfxTexAlphaCombineExt : c = %x", c);
         if (num_tex == 0)
             strcat(fragment_shader_texture0, "ctex0_c.a = 0.0; \n");
         else
@@ -2634,7 +2628,7 @@ grTexAlphaCombineExt(GrChipID_t       tmu,
             strcat(fragment_shader_texture1, "ctex1_d.a = readtex1.a; \n");
         break;
     default:
-        WriteTrace(TraceGlitch, TraceWarning, "grTexAlphaCombineExt : d = %x", d);
+        WriteTrace(TraceGlitch, TraceWarning, "gfxTexAlphaCombineExt : d = %x", d);
         if (num_tex == 0)
             strcat(fragment_shader_texture0, "ctex0_d.a = 0.0; \n");
         else
diff --git a/Source/Project64-video/Renderer/Renderer.h b/Source/Project64-video/Renderer/Renderer.h
index 84fcb835a..9b8346149 100644
--- a/Source/Project64-video/Renderer/Renderer.h
+++ b/Source/Project64-video/Renderer/Renderer.h
@@ -39,6 +39,7 @@ void gfxStippleMode(GrStippleMode_t mode);
 void gfxColorCombineExt(GrCCUColor_t a, GrCombineMode_t a_mode, GrCCUColor_t b, GrCombineMode_t b_mode, GrCCUColor_t c, FxBool c_invert, GrCCUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert);
 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);
 
 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 4b46403fc..b0d5c01db 100644
--- a/Source/Project64-video/TexCache.cpp
+++ b/Source/Project64-video/TexCache.cpp
@@ -701,7 +701,7 @@ void TexCache()
                 if (!(cmb.tex_cmb_ext_use & TEX_COMBINE_EXT_ALPHA))
                     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);
-                grTexAlphaCombineExt(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);
+                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);
             }
             else
@@ -729,7 +729,7 @@ void TexCache()
                     TexAlphaCombinerToExtension(GR_TMU0);
                 }
                 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);
-                grTexAlphaCombineExt(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);
+                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);
             }
             else