diff --git a/Source/Project64-video/Renderer/OGLESgeometry.cpp b/Source/Project64-video/Renderer/OGLESgeometry.cpp index 3e6fa60f8..2380b0b5f 100644 --- a/Source/Project64-video/Renderer/OGLESgeometry.cpp +++ b/Source/Project64-video/Renderer/OGLESgeometry.cpp @@ -344,8 +344,7 @@ void gfxDrawTriangle(const void *a, const void *b, const void *c) WriteTrace(TraceGlitch, TraceDebug, "Done"); } -FX_ENTRY void FX_CALL -grDrawLine(const void *a, const void *b) +void gfxDrawLine(const void *a, const void *b) { } diff --git a/Source/Project64-video/Renderer/OGLgeometry.cpp b/Source/Project64-video/Renderer/OGLgeometry.cpp index e6e7aaf90..d68b34818 100644 --- a/Source/Project64-video/Renderer/OGLgeometry.cpp +++ b/Source/Project64-video/Renderer/OGLgeometry.cpp @@ -442,8 +442,7 @@ void gfxDrawTriangle(const void *a, const void *b, const void *c) grDisplayGLError("gfxDrawTriangle"); } -FX_ENTRY void FX_CALL -grDrawLine(const void *a, const void *b) +void gfxDrawLine(const void *a, const void *b) { float *a_x = (float*)a + xy_off / sizeof(float); float *a_y = (float*)a + xy_off / sizeof(float) + 1; @@ -532,7 +531,7 @@ grDrawLine(const void *a, const void *b) -(*b_y - (float)heighto) / (float)(g_height / 2) / *b_q, ZCALC(*b_z, *b_q), 1.0f / *b_q); glEnd(); - grDisplayGLError("grDrawLine"); + grDisplayGLError("gfxDrawLine"); } FX_ENTRY void FX_CALL diff --git a/Source/Project64-video/Renderer/Renderer.h b/Source/Project64-video/Renderer/Renderer.h index cef9b6d30..b5c3c67e2 100644 --- a/Source/Project64-video/Renderer/Renderer.h +++ b/Source/Project64-video/Renderer/Renderer.h @@ -48,6 +48,7 @@ void gfxDepthBufferFunction(GrCmpFnc_t function); 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); 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 c41e5f90a..b134b09c3 100644 --- a/Source/Project64-video/Util.cpp +++ b/Source/Project64-video/Util.cpp @@ -1543,7 +1543,7 @@ static void render_tri(uint16_t linew, int old_interpolate) { j = i + 1; if (j == n) j = 0; - grDrawLine(&rdp.vtxbuf[i], &rdp.vtxbuf[j]); + gfxDrawLine(&rdp.vtxbuf[i], &rdp.vtxbuf[j]); } } else diff --git a/Source/Project64-video/rdp.cpp b/Source/Project64-video/rdp.cpp index 8f55d063b..ea232af7f 100644 --- a/Source/Project64-video/rdp.cpp +++ b/Source/Project64-video/rdp.cpp @@ -1578,11 +1578,11 @@ void rdp_texrect() if (g_settings->wireframe()) { SetWireframeCol(); - grDrawLine(&vstd[0], &vstd[2]); - grDrawLine(&vstd[2], &vstd[1]); - grDrawLine(&vstd[1], &vstd[0]); - grDrawLine(&vstd[2], &vstd[3]); - grDrawLine(&vstd[3], &vstd[1]); + gfxDrawLine(&vstd[0], &vstd[2]); + gfxDrawLine(&vstd[2], &vstd[1]); + gfxDrawLine(&vstd[1], &vstd[0]); + gfxDrawLine(&vstd[2], &vstd[3]); + gfxDrawLine(&vstd[3], &vstd[1]); } else { @@ -2553,12 +2553,12 @@ void rdp_fillrect() if (g_settings->wireframe()) { SetWireframeCol(); - grDrawLine(&v[0], &v[2]); - grDrawLine(&v[2], &v[1]); - grDrawLine(&v[1], &v[0]); - grDrawLine(&v[2], &v[3]); - grDrawLine(&v[3], &v[1]); - //grDrawLine (&v[1], &v[2]); + gfxDrawLine(&v[0], &v[2]); + gfxDrawLine(&v[2], &v[1]); + gfxDrawLine(&v[1], &v[0]); + gfxDrawLine(&v[2], &v[3]); + gfxDrawLine(&v[3], &v[1]); + //gfxDrawLine (&v[1], &v[2]); } else {