ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Video] Rename grDrawLine to gfxDrawLine

This commit is contained in:
zilmar 2017-05-25 18:01:37 +10:00
parent c0413aeb66
commit 5f1e959294
5 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Project64-video/Renderer/OGLESgeometry.cpp
View File

@ -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)
{
}

5
Source/Project64-video/Renderer/OGLgeometry.cpp
View File

@ -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

1
Source/Project64-video/Renderer/Renderer.h
View File

@ -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;

2
Source/Project64-video/Util.cpp
View File

@ -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

22
Source/Project64-video/rdp.cpp
View File

@ -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
{