diff --git a/Source/Project64-video/FBtoScreen.cpp b/Source/Project64-video/FBtoScreen.cpp
index bd61ad440..a43d13672 100644
--- a/Source/Project64-video/FBtoScreen.cpp
+++ b/Source/Project64-video/FBtoScreen.cpp
@@ -59,7 +59,7 @@ static int SetupFBtoScreenCombiner(uint32_t texture_size, uint32_t opaque)
             FXFALSE);
     }
     int filter = (rdp.filter_mode != 2) ? GR_TEXTUREFILTER_POINT_SAMPLED : GR_TEXTUREFILTER_BILINEAR;
-    grTexFilterMode(tmu, filter, filter);
+    gfxTexFilterMode(tmu, filter, filter);
     gfxTexClampMode(tmu,
         GR_TEXTURECLAMP_CLAMP,
         GR_TEXTURECLAMP_CLAMP);
diff --git a/Source/Project64-video/Main.cpp b/Source/Project64-video/Main.cpp
index 9f3b7cc4a..213fbfc70 100644
--- a/Source/Project64-video/Main.cpp
+++ b/Source/Project64-video/Main.cpp
@@ -556,8 +556,8 @@ int InitGfx()
     gfxBufferSwap(0);
     gfxBufferClear(0, 0, 0xFFFF);
     gfxDepthMask(FXFALSE);
-    grTexFilterMode(0, GR_TEXTUREFILTER_BILINEAR, GR_TEXTUREFILTER_BILINEAR);
-    grTexFilterMode(1, GR_TEXTUREFILTER_BILINEAR, GR_TEXTUREFILTER_BILINEAR);
+    gfxTexFilterMode(0, GR_TEXTUREFILTER_BILINEAR, GR_TEXTUREFILTER_BILINEAR);
+    gfxTexFilterMode(1, GR_TEXTUREFILTER_BILINEAR, GR_TEXTUREFILTER_BILINEAR);
     gfxTexClampMode(0, GR_TEXTURECLAMP_CLAMP, GR_TEXTURECLAMP_CLAMP);
     gfxTexClampMode(1, GR_TEXTURECLAMP_CLAMP, GR_TEXTURECLAMP_CLAMP);
     gfxClipWindow(0, 0, g_scr_res_x, g_scr_res_y);
diff --git a/Source/Project64-video/Renderer/OGLESglitchmain.cpp b/Source/Project64-video/Renderer/OGLESglitchmain.cpp
index b97ff1abf..6cf9b4c20 100644
--- a/Source/Project64-video/Renderer/OGLESglitchmain.cpp
+++ b/Source/Project64-video/Renderer/OGLESglitchmain.cpp
@@ -1317,7 +1317,7 @@ void gfxAuxBufferExt(GrBuffer_t buffer)
         glDisable(GL_CULL_FACE);
         //glDisable(GL_ALPHA_TEST);
         glDepthMask(GL_TRUE);
-        grTexFilterMode(GR_TMU1, GR_TEXTUREFILTER_POINT_SAMPLED, GR_TEXTUREFILTER_POINT_SAMPLED);
+        gfxTexFilterMode(GR_TMU1, GR_TEXTUREFILTER_POINT_SAMPLED, GR_TEXTUREFILTER_POINT_SAMPLED);
     }
     else {
         glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
diff --git a/Source/Project64-video/Renderer/OGLEStextures.cpp b/Source/Project64-video/Renderer/OGLEStextures.cpp
index f7c199ae2..6ab818941 100644
--- a/Source/Project64-video/Renderer/OGLEStextures.cpp
+++ b/Source/Project64-video/Renderer/OGLEStextures.cpp
@@ -719,12 +719,7 @@ void gfxTexDetailControl(GrChipID_t tmu, int lod_bias, FxU8 detail_scale, float
     set_lambda();
 }
 
-FX_ENTRY void FX_CALL
-grTexFilterMode(
-    GrChipID_t tmu,
-    GrTextureFilterMode_t minfilter_mode,
-    GrTextureFilterMode_t magfilter_mode
-)
+void gfxTexFilterMode(GrChipID_t tmu, GrTextureFilterMode_t minfilter_mode, GrTextureFilterMode_t magfilter_mode)
 {
     WriteTrace(TraceGlitch, TraceDebug, "tmu = %d, bias: %d magfilter_mode: %d", tmu, minfilter_mode, magfilter_mode);
     if (tmu == GR_TMU1)
diff --git a/Source/Project64-video/Renderer/OGLglitchmain.cpp b/Source/Project64-video/Renderer/OGLglitchmain.cpp
index 34dddffa7..0e9d3b7a3 100644
--- a/Source/Project64-video/Renderer/OGLglitchmain.cpp
+++ b/Source/Project64-video/Renderer/OGLglitchmain.cpp
@@ -1589,7 +1589,7 @@ void gfxAuxBufferExt(GrBuffer_t buffer)
         glDisable(GL_CULL_FACE);
         glDisable(GL_ALPHA_TEST);
         glDepthMask(GL_TRUE);
-        grTexFilterMode(GR_TMU1, GR_TEXTUREFILTER_POINT_SAMPLED, GR_TEXTUREFILTER_POINT_SAMPLED);
+        gfxTexFilterMode(GR_TMU1, GR_TEXTUREFILTER_POINT_SAMPLED, GR_TEXTUREFILTER_POINT_SAMPLED);
     }
     else {
         glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
diff --git a/Source/Project64-video/Renderer/OGLtextures.cpp b/Source/Project64-video/Renderer/OGLtextures.cpp
index bcfda4c14..3533f6e11 100644
--- a/Source/Project64-video/Renderer/OGLtextures.cpp
+++ b/Source/Project64-video/Renderer/OGLtextures.cpp
@@ -717,12 +717,7 @@ void gfxTexDetailControl(GrChipID_t tmu, int lod_bias, FxU8 detail_scale, float
     set_lambda();
 }
 
-FX_ENTRY void FX_CALL
-grTexFilterMode(
-    GrChipID_t tmu,
-    GrTextureFilterMode_t minfilter_mode,
-    GrTextureFilterMode_t magfilter_mode
-)
+void gfxTexFilterMode(GrChipID_t tmu, GrTextureFilterMode_t minfilter_mode, GrTextureFilterMode_t magfilter_mode)
 {
     WriteTrace(TraceGlitch, TraceDebug, "tmu = %d, bias: %d magfilter_mode: %d", tmu, minfilter_mode, magfilter_mode);
     if (tmu == GR_TMU1 || nbTextureUnits <= 2)
@@ -750,7 +745,7 @@ grTexFilterMode(
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter1);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter1);
     }
-    grDisplayGLError("grTexFilterMode");
+    grDisplayGLError("gfxTexFilterMode");
 }
 
 void gfxTexClampMode(GrChipID_t tmu, GrTextureClampMode_t s_clampmode, GrTextureClampMode_t t_clampmode)
diff --git a/Source/Project64-video/Renderer/Renderer.h b/Source/Project64-video/Renderer/Renderer.h
index d97ce2f73..059eb4b01 100644
--- a/Source/Project64-video/Renderer/Renderer.h
+++ b/Source/Project64-video/Renderer/Renderer.h
@@ -72,6 +72,7 @@ void gfxTexDownloadMipMap(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrT
 void gfxTexSource(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrTexInfo *info);
 void gfxTexDetailControl(GrChipID_t tmu, int lod_bias, FxU8 detail_scale, float detail_max);
 void gfxTexClampMode(GrChipID_t tmu, GrTextureClampMode_t s_clampmode, GrTextureClampMode_t t_clampmode);
+void gfxTexFilterMode(GrChipID_t tmu, GrTextureFilterMode_t minfilter_mode, GrTextureFilterMode_t magfilter_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/TexCache.cpp b/Source/Project64-video/TexCache.cpp
index ae914c7f4..7e204aec6 100644
--- a/Source/Project64-video/TexCache.cpp
+++ b/Source/Project64-video/TexCache.cpp
@@ -823,12 +823,12 @@ void TexCache()
             if (g_settings->filtering() == CSettings::Filter_Automatic)
             {
                 int filter = (rdp.filter_mode != 2) ? GR_TEXTUREFILTER_POINT_SAMPLED : GR_TEXTUREFILTER_BILINEAR;
-                grTexFilterMode(tmu, filter, filter);
+                gfxTexFilterMode(tmu, filter, filter);
             }
             else
             {
                 int filter = (g_settings->filtering() == CSettings::Filter_ForceBilinear) ? GR_TEXTUREFILTER_BILINEAR : GR_TEXTUREFILTER_POINT_SAMPLED;
-                grTexFilterMode(tmu, filter, filter);
+                gfxTexFilterMode(tmu, filter, filter);
             }
 
             if (rdp.cur_cache[i])
diff --git a/Source/Project64-video/Util.cpp b/Source/Project64-video/Util.cpp
index 67ad199de..344cbce88 100644
--- a/Source/Project64-video/Util.cpp
+++ b/Source/Project64-video/Util.cpp
@@ -1968,7 +1968,7 @@ void set_message_combiner()
         GR_BLEND_ZERO);
     gfxAlphaTestFunction(GR_CMP_ALWAYS);
     gfxStippleMode(GR_STIPPLE_DISABLE);
-    grTexFilterMode(0, GR_TEXTUREFILTER_BILINEAR, GR_TEXTUREFILTER_BILINEAR);
+    gfxTexFilterMode(0, GR_TEXTUREFILTER_BILINEAR, GR_TEXTUREFILTER_BILINEAR);
     gfxTexCombine(GR_TMU1,
         GR_COMBINE_FUNCTION_NONE,
         GR_COMBINE_FACTOR_NONE,