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

[video] rename gfxDrawVertexArrayContiguous to grDrawVertexArrayContiguous

This commit is contained in:
zilmar 2017-05-25 18:10:13 +10:00
parent 1b67d26c14
commit 12ccc88c4f
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -372,10 +372,9 @@ void gfxDrawVertexArray(FxU32 mode, FxU32 Count, void *pointers2)
vbo_buffer(GL_TRIANGLE_FAN, 0, Count, pointers[0]); vbo_buffer(GL_TRIANGLE_FAN, 0, Count, pointers[0]);
} }
FX_ENTRY void FX_CALL void gfxDrawVertexArrayContiguous(FxU32 mode, FxU32 Count, void *pointers, FxU32 stride)
grDrawVertexArrayContiguous(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) 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); vbo_buffer(GL_TRIANGLE_FAN, 0, Count, pointers);
break; break;
default: default:
WriteTrace(TraceGlitch, TraceWarning, "grDrawVertexArrayContiguous : unknown mode : %x", mode); WriteTrace(TraceGlitch, TraceWarning, "gfxDrawVertexArrayContiguous : unknown mode : %x", mode);
} }
} }

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

@ -606,8 +606,7 @@ void gfxDrawVertexArray(FxU32 mode, FxU32 Count, void *pointers2)
grDisplayGLError("gfxDrawVertexArray"); grDisplayGLError("gfxDrawVertexArray");
} }
FX_ENTRY void FX_CALL void gfxDrawVertexArrayContiguous(FxU32 mode, FxU32 Count, void *pointers, FxU32 stride)
grDrawVertexArrayContiguous(FxU32 mode, FxU32 Count, void *pointers, FxU32 stride)
{ {
unsigned int i; unsigned int i;
float *x, *y, *q, *s0, *t0, *s1, *t1, *z, *fog; 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); glBegin(GL_TRIANGLE_FAN);
break; break;
default: default:
WriteTrace(TraceGlitch, TraceWarning, "grDrawVertexArrayContiguous : unknown mode : %x", mode); WriteTrace(TraceGlitch, TraceWarning, "gfxDrawVertexArrayContiguous : unknown mode : %x", mode);
} }
for (i = 0; i < Count; i++) for (i = 0; i < Count; i++)
@ -681,5 +680,5 @@ grDrawVertexArrayContiguous(FxU32 mode, FxU32 Count, void *pointers, FxU32 strid
} }
glEnd(); glEnd();
grDisplayGLError("grDrawVertexArrayContiguous"); grDisplayGLError("gfxDrawVertexArrayContiguous");
} }

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

@ -50,6 +50,7 @@ void gfxDrawTriangle(const void *a, const void *b, const void *c);
void gfxDepthBiasLevel(FxI32 level); void gfxDepthBiasLevel(FxI32 level);
void gfxDrawLine(const void *a, const void *b); void gfxDrawLine(const void *a, const void *b);
void gfxDrawVertexArray(FxU32 mode, FxU32 Count, void *pointers2); 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 nbTextureUnits;
extern uint32_t g_scr_res_x, g_scr_res_y, g_res_x, g_res_y; extern uint32_t g_scr_res_x, g_scr_res_y, g_res_x, g_res_y;

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

@ -1586,7 +1586,7 @@ void rdp_texrect()
} }
else else
{ {
grDrawVertexArrayContiguous(GR_TRIANGLE_STRIP, n_vertices, vptr, sizeof(VERTEX)); gfxDrawVertexArrayContiguous(GR_TRIANGLE_STRIP, n_vertices, vptr, sizeof(VERTEX));
} }
rdp.tri_n += 2; 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); ConvertCoordsConvert(vtxbuf, nbVtxs);
gfxCullMode(GR_CULL_DISABLE); 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) void rdp_triangle(int shade, int texture, int zbuffer)

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

@ -511,7 +511,7 @@ void DrawImage(DRAWIMAGE & d)
apply_shade_mods(&(v[s])); apply_shade_mods(&(v[s]));
ConvertCoordsConvert(v, 4); ConvertCoordsConvert(v, 4);
grDrawVertexArrayContiguous(GR_TRIANGLE_STRIP, 4, v, sizeof(VERTEX)); gfxDrawVertexArrayContiguous(GR_TRIANGLE_STRIP, 4, v, sizeof(VERTEX));
rdp.tri_n += 2; rdp.tri_n += 2;
} }
else else