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

[Video] Rename grDrawVertexArray to gfxDrawVertexArray

This commit is contained in:
zilmar 2017-05-25 18:05:53 +10:00
parent 5f1e959294
commit 1b67d26c14
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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