From 12ccc88c4f8457c250067bb8f0f18485166497ba Mon Sep 17 00:00:00 2001
From: zilmar <zilmae@pj64-emu.com>
Date: Thu, 25 May 2017 18:10:13 +1000
Subject: [PATCH] [video] rename gfxDrawVertexArrayContiguous to
 grDrawVertexArrayContiguous

---
 Source/Project64-video/Renderer/OGLESgeometry.cpp | 7 +++----
 Source/Project64-video/Renderer/OGLgeometry.cpp   | 7 +++----
 Source/Project64-video/Renderer/Renderer.h        | 1 +
 Source/Project64-video/rdp.cpp                    | 4 ++--
 Source/Project64-video/ucode06.cpp                | 2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Source/Project64-video/Renderer/OGLESgeometry.cpp b/Source/Project64-video/Renderer/OGLESgeometry.cpp
index 91923f797..b588368b0 100644
--- a/Source/Project64-video/Renderer/OGLESgeometry.cpp
+++ b/Source/Project64-video/Renderer/OGLESgeometry.cpp
@@ -372,10 +372,9 @@ void gfxDrawVertexArray(FxU32 mode, FxU32 Count, void *pointers2)
     vbo_buffer(GL_TRIANGLE_FAN, 0, Count, pointers[0]);
 }
 
-FX_ENTRY void FX_CALL
-grDrawVertexArrayContiguous(FxU32 mode, FxU32 Count, void *pointers, FxU32 stride)
+void gfxDrawVertexArrayContiguous(FxU32 mode, FxU32 Count, void *pointers, FxU32 stride)
 {
-    WriteTrace(TraceGlitch, TraceDebug, "grDrawVertexArrayContiguous(%d,%d,%d)\r\n", mode, Count, stride);
+    WriteTrace(TraceGlitch, TraceDebug, "gfxDrawVertexArrayContiguous(%d,%d,%d)\r\n", mode, Count, stride);
 
     if (nvidia_viewport_hack && !render_to_texture)
     {
@@ -403,6 +402,6 @@ grDrawVertexArrayContiguous(FxU32 mode, FxU32 Count, void *pointers, FxU32 strid
         vbo_buffer(GL_TRIANGLE_FAN, 0, Count, pointers);
         break;
     default:
-        WriteTrace(TraceGlitch, TraceWarning, "grDrawVertexArrayContiguous : unknown mode : %x", mode);
+        WriteTrace(TraceGlitch, TraceWarning, "gfxDrawVertexArrayContiguous : unknown mode : %x", mode);
     }
 }
\ No newline at end of file
diff --git a/Source/Project64-video/Renderer/OGLgeometry.cpp b/Source/Project64-video/Renderer/OGLgeometry.cpp
index e0e822a72..8807361c2 100644
--- a/Source/Project64-video/Renderer/OGLgeometry.cpp
+++ b/Source/Project64-video/Renderer/OGLgeometry.cpp
@@ -606,8 +606,7 @@ void gfxDrawVertexArray(FxU32 mode, FxU32 Count, void *pointers2)
     grDisplayGLError("gfxDrawVertexArray");
 }
 
-FX_ENTRY void FX_CALL
-grDrawVertexArrayContiguous(FxU32 mode, FxU32 Count, void *pointers, FxU32 stride)
+void gfxDrawVertexArrayContiguous(FxU32 mode, FxU32 Count, void *pointers, FxU32 stride)
 {
     unsigned int i;
     float *x, *y, *q, *s0, *t0, *s1, *t1, *z, *fog;
@@ -633,7 +632,7 @@ grDrawVertexArrayContiguous(FxU32 mode, FxU32 Count, void *pointers, FxU32 strid
         glBegin(GL_TRIANGLE_FAN);
         break;
     default:
-        WriteTrace(TraceGlitch, TraceWarning, "grDrawVertexArrayContiguous : unknown mode : %x", mode);
+        WriteTrace(TraceGlitch, TraceWarning, "gfxDrawVertexArrayContiguous : unknown mode : %x", mode);
     }
 
     for (i = 0; i < Count; i++)
@@ -681,5 +680,5 @@ grDrawVertexArrayContiguous(FxU32 mode, FxU32 Count, void *pointers, FxU32 strid
     }
     glEnd();
 
-    grDisplayGLError("grDrawVertexArrayContiguous");
+    grDisplayGLError("gfxDrawVertexArrayContiguous");
 }
\ No newline at end of file
diff --git a/Source/Project64-video/Renderer/Renderer.h b/Source/Project64-video/Renderer/Renderer.h
index c9bfda837..eeb1d1a3c 100644
--- a/Source/Project64-video/Renderer/Renderer.h
+++ b/Source/Project64-video/Renderer/Renderer.h
@@ -50,6 +50,7 @@ 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);
+void gfxDrawVertexArrayContiguous(FxU32 mode, FxU32 Count, void *pointers, FxU32 stride);
 
 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/rdp.cpp b/Source/Project64-video/rdp.cpp
index ea232af7f..b64f67317 100644
--- a/Source/Project64-video/rdp.cpp
+++ b/Source/Project64-video/rdp.cpp
@@ -1586,7 +1586,7 @@ void rdp_texrect()
     }
     else
     {
-        grDrawVertexArrayContiguous(GR_TRIANGLE_STRIP, n_vertices, vptr, sizeof(VERTEX));
+        gfxDrawVertexArrayContiguous(GR_TRIANGLE_STRIP, n_vertices, vptr, sizeof(VERTEX));
     }
 
     rdp.tri_n += 2;
@@ -3964,7 +3964,7 @@ void lle_triangle(uint32_t w1, uint32_t w2, int shade, int texture, int zbuffer,
     }
     ConvertCoordsConvert(vtxbuf, nbVtxs);
     gfxCullMode(GR_CULL_DISABLE);
-    grDrawVertexArrayContiguous(GR_TRIANGLE_STRIP, nbVtxs - 1, vtxbuf, sizeof(VERTEX));
+    gfxDrawVertexArrayContiguous(GR_TRIANGLE_STRIP, nbVtxs - 1, vtxbuf, sizeof(VERTEX));
 }
 
 void rdp_triangle(int shade, int texture, int zbuffer)
diff --git a/Source/Project64-video/ucode06.cpp b/Source/Project64-video/ucode06.cpp
index 72ba4fd47..79259db5f 100644
--- a/Source/Project64-video/ucode06.cpp
+++ b/Source/Project64-video/ucode06.cpp
@@ -511,7 +511,7 @@ void DrawImage(DRAWIMAGE & d)
                     apply_shade_mods(&(v[s]));
                 ConvertCoordsConvert(v, 4);
 
-                grDrawVertexArrayContiguous(GR_TRIANGLE_STRIP, 4, v, sizeof(VERTEX));
+                gfxDrawVertexArrayContiguous(GR_TRIANGLE_STRIP, 4, v, sizeof(VERTEX));
                 rdp.tri_n += 2;
             }
             else