From 6f29160453d33706ae325c093097cb2b4fe2e32c Mon Sep 17 00:00:00 2001
From: zilmar <zilmae@pj64-emu.com>
Date: Thu, 25 May 2017 08:31:05 +1000
Subject: [PATCH] [Video] Rename grVertexLayout to gfxVertexLayout

---
 Source/Project64-video/Main.cpp                   | 14 +++++++-------
 Source/Project64-video/Renderer/OGLESgeometry.cpp |  5 ++---
 Source/Project64-video/Renderer/OGLgeometry.cpp   |  5 ++---
 Source/Project64-video/Renderer/Renderer.h        |  1 +
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Source/Project64-video/Main.cpp b/Source/Project64-video/Main.cpp
index e54074b11..f0157dbf7 100644
--- a/Source/Project64-video/Main.cpp
+++ b/Source/Project64-video/Main.cpp
@@ -522,19 +522,19 @@ int InitGfx()
     voodoo.sup_mirroring = 1;
 #endif
 
-    grVertexLayout(GR_PARAM_XY, offsetof(VERTEX, x), GR_PARAM_ENABLE);
-    grVertexLayout(GR_PARAM_Q, offsetof(VERTEX, q), GR_PARAM_ENABLE);
-    grVertexLayout(GR_PARAM_Z, offsetof(VERTEX, z), GR_PARAM_ENABLE);
-    grVertexLayout(GR_PARAM_ST0, offsetof(VERTEX, coord[0]), GR_PARAM_ENABLE);
-    grVertexLayout(GR_PARAM_ST1, offsetof(VERTEX, coord[2]), GR_PARAM_ENABLE);
-    grVertexLayout(GR_PARAM_PARGB, offsetof(VERTEX, b), GR_PARAM_ENABLE);
+    gfxVertexLayout(GR_PARAM_XY, offsetof(VERTEX, x), GR_PARAM_ENABLE);
+    gfxVertexLayout(GR_PARAM_Q, offsetof(VERTEX, q), GR_PARAM_ENABLE);
+    gfxVertexLayout(GR_PARAM_Z, offsetof(VERTEX, z), GR_PARAM_ENABLE);
+    gfxVertexLayout(GR_PARAM_ST0, offsetof(VERTEX, coord[0]), GR_PARAM_ENABLE);
+    gfxVertexLayout(GR_PARAM_ST1, offsetof(VERTEX, coord[2]), GR_PARAM_ENABLE);
+    gfxVertexLayout(GR_PARAM_PARGB, offsetof(VERTEX, b), GR_PARAM_ENABLE);
 
     grCullMode(GR_CULL_NEGATIVE);
 
     if (g_settings->fog()) //"FOGCOORD" extension
     {
         gfxFogGenerateLinear(0.0f, 255.0f);
-        grVertexLayout(GR_PARAM_FOG_EXT, offsetof(VERTEX, f), GR_PARAM_ENABLE);
+        gfxVertexLayout(GR_PARAM_FOG_EXT, offsetof(VERTEX, f), GR_PARAM_ENABLE);
     }
 
     grDepthBufferMode(GR_DEPTHBUFFER_ZBUFFER);
diff --git a/Source/Project64-video/Renderer/OGLESgeometry.cpp b/Source/Project64-video/Renderer/OGLESgeometry.cpp
index bb65cb66d..ddcdaf9de 100644
--- a/Source/Project64-video/Renderer/OGLESgeometry.cpp
+++ b/Source/Project64-video/Renderer/OGLESgeometry.cpp
@@ -143,8 +143,7 @@ void init_geometry()
     glDisable(GL_DEPTH_TEST);
 }
 
-FX_ENTRY void FX_CALL
-grVertexLayout(FxU32 param, FxI32 offset, FxU32 mode)
+void gfxVertexLayout(FxU32 param, FxI32 offset, FxU32 mode)
 {
     WriteTrace(TraceGlitch, TraceDebug, "param: %d offset: %d mode: %d", param, offset, mode);
     switch (param)
@@ -178,7 +177,7 @@ grVertexLayout(FxU32 param, FxI32 offset, FxU32 mode)
         st1_off = offset;
         break;
     default:
-        WriteTrace(TraceGlitch, TraceWarning, "unknown grVertexLayout parameter : %x", param);
+        WriteTrace(TraceGlitch, TraceWarning, "unknown gfxVertexLayout parameter : %x", param);
     }
 }
 
diff --git a/Source/Project64-video/Renderer/OGLgeometry.cpp b/Source/Project64-video/Renderer/OGLgeometry.cpp
index 2d6acc033..523917d42 100644
--- a/Source/Project64-video/Renderer/OGLgeometry.cpp
+++ b/Source/Project64-video/Renderer/OGLgeometry.cpp
@@ -73,8 +73,7 @@ void init_geometry()
     grDisplayGLError("init_geometry");
 }
 
-FX_ENTRY void FX_CALL
-grVertexLayout(FxU32 param, FxI32 offset, FxU32 mode)
+void gfxVertexLayout(FxU32 param, FxI32 offset, FxU32 mode)
 {
     WriteTrace(TraceGlitch, TraceDebug, "param: %d offset: %d mode: %d", param, offset, mode);
     switch (param)
@@ -108,7 +107,7 @@ grVertexLayout(FxU32 param, FxI32 offset, FxU32 mode)
         st1_off = offset;
         break;
     default:
-        WriteTrace(TraceGlitch, TraceWarning, "unknown grVertexLayout parameter : %x", param);
+        WriteTrace(TraceGlitch, TraceWarning, "unknown gfxVertexLayout parameter : %x", param);
     }
 }
 
diff --git a/Source/Project64-video/Renderer/Renderer.h b/Source/Project64-video/Renderer/Renderer.h
index 4c851c6fc..01bdbce58 100644
--- a/Source/Project64-video/Renderer/Renderer.h
+++ b/Source/Project64-video/Renderer/Renderer.h
@@ -41,6 +41,7 @@ void gfxAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode, GrACUColor_t b,
 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);
+void gfxVertexLayout(FxU32 param, FxI32 offset, FxU32 mode);
 
 extern uint32_t nbTextureUnits;
 extern uint32_t g_scr_res_x, g_scr_res_y, g_res_x, g_res_y;