From 1b67d26c143e078c7687567f84e6c320292a0592 Mon Sep 17 00:00:00 2001
From: zilmar <zilmae@pj64-emu.com>
Date: Thu, 25 May 2017 18:05:53 +1000
Subject: [PATCH] [Video] Rename grDrawVertexArray to gfxDrawVertexArray

---
 Source/Project64-video/Renderer/OGLESgeometry.cpp | 7 +++----
 Source/Project64-video/Renderer/OGLgeometry.cpp   | 7 +++----
 Source/Project64-video/Renderer/Renderer.h        | 1 +
 Source/Project64-video/Util.cpp                   | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Source/Project64-video/Renderer/OGLESgeometry.cpp b/Source/Project64-video/Renderer/OGLESgeometry.cpp
index 2380b0b5f..91923f797 100644
--- a/Source/Project64-video/Renderer/OGLESgeometry.cpp
+++ b/Source/Project64-video/Renderer/OGLESgeometry.cpp
@@ -348,11 +348,10 @@ void gfxDrawLine(const void *a, const void *b)
 {
 }
 
-FX_ENTRY void FX_CALL
-grDrawVertexArray(FxU32 mode, FxU32 Count, void *pointers2)
+void gfxDrawVertexArray(FxU32 mode, FxU32 Count, void *pointers2)
 {
     void **pointers = (void**)pointers2;
-    WriteTrace(TraceGlitch, TraceDebug, "grDrawVertexArray(%d,%d)\r\n", mode, Count);
+    WriteTrace(TraceGlitch, TraceDebug, "gfxDrawVertexArray(%d,%d)\r\n", mode, Count);
 
     if (nvidia_viewport_hack && !render_to_texture)
     {
@@ -366,7 +365,7 @@ grDrawVertexArray(FxU32 mode, FxU32 Count, void *pointers2)
 
     if (mode != GR_TRIANGLE_FAN)
     {
-        WriteTrace(TraceGlitch, TraceWarning, "grDrawVertexArray : unknown mode : %x", mode);
+        WriteTrace(TraceGlitch, TraceWarning, "gfxDrawVertexArray : unknown mode : %x", mode);
     }
 
     vbo_enable();
diff --git a/Source/Project64-video/Renderer/OGLgeometry.cpp b/Source/Project64-video/Renderer/OGLgeometry.cpp
index d68b34818..e0e822a72 100644
--- a/Source/Project64-video/Renderer/OGLgeometry.cpp
+++ b/Source/Project64-video/Renderer/OGLgeometry.cpp
@@ -534,8 +534,7 @@ void gfxDrawLine(const void *a, const void *b)
     grDisplayGLError("gfxDrawLine");
 }
 
-FX_ENTRY void FX_CALL
-grDrawVertexArray(FxU32 mode, FxU32 Count, void *pointers2)
+void gfxDrawVertexArray(FxU32 mode, FxU32 Count, void *pointers2)
 {
     unsigned int i;
     float *x, *y, *q, *s0, *t0, *s1, *t1, *z, *fog;
@@ -559,7 +558,7 @@ grDrawVertexArray(FxU32 mode, FxU32 Count, void *pointers2)
         glBegin(GL_TRIANGLE_FAN);
         break;
     default:
-        WriteTrace(TraceGlitch, TraceWarning, "grDrawVertexArray : unknown mode : %x", mode);
+        WriteTrace(TraceGlitch, TraceWarning, "gfxDrawVertexArray : unknown mode : %x", mode);
     }
 
     for (i = 0; i < Count; i++)
@@ -604,7 +603,7 @@ grDrawVertexArray(FxU32 mode, FxU32 Count, void *pointers2)
     }
     glEnd();
 
-    grDisplayGLError("grDrawVertexArray");
+    grDisplayGLError("gfxDrawVertexArray");
 }
 
 FX_ENTRY void FX_CALL
diff --git a/Source/Project64-video/Renderer/Renderer.h b/Source/Project64-video/Renderer/Renderer.h
index b5c3c67e2..c9bfda837 100644
--- a/Source/Project64-video/Renderer/Renderer.h
+++ b/Source/Project64-video/Renderer/Renderer.h
@@ -49,6 +49,7 @@ void gfxDepthMask(FxBool mask);
 void gfxDrawTriangle(const void *a, const void *b, const void *c);
 void gfxDepthBiasLevel(FxI32 level);
 void gfxDrawLine(const void *a, const void *b);
+void gfxDrawVertexArray(FxU32 mode, FxU32 Count, void *pointers2);
 
 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 b134b09c3..387014dd2 100644
--- a/Source/Project64-video/Util.cpp
+++ b/Source/Project64-video/Util.cpp
@@ -1604,7 +1604,7 @@ static void render_tri(uint16_t linew, int old_interpolate)
             DepthBuffer(rdp.vtxbuf, n);
             if ((rdp.rm & 0xC10) == 0xC10)
                 gfxDepthBiasLevel(-deltaZ);
-            grDrawVertexArray(GR_TRIANGLE_FAN, n, rdp.vtx_buffer ? (&vtx_list2) : (&vtx_list1));
+            gfxDrawVertexArray(GR_TRIANGLE_FAN, n, rdp.vtx_buffer ? (&vtx_list2) : (&vtx_list1));
         }
     }
 }