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

[video] remove grDrawPoint

This commit is contained in:
zilmar 2017-05-25 17:52:55 +10:00
parent 15d179fd6d
commit c0413aeb66
3 changed files with 0 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Project64-video/Combine.cpp
View File

@ -15511,15 +15511,6 @@ void Combine()
= cmb.modfactor_0 = cmb.modfactor_1 = 0;
cmb.ccolor = cmb.tex_ccolor = 0;
if (cmb.cmb_ext_use || cmb.tex_cmb_ext_use)
{
//have to draw something to allow use of standard combine functions
VERTEX v;
memset(&v, 0, sizeof(v));
grDrawPoint(&v);
cmb.cmb_ext_use = 0;
cmb.tex_cmb_ext_use = 0;
}
uint32_t cmb_mode_c = (rdp.cycle1 << 16) | (rdp.cycle2 & 0xFFFF);
uint32_t cmb_mode_a = (rdp.cycle1 & 0x0FFF0000) | ((rdp.cycle2 >> 16) & 0x00000FFF);

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

@ -344,11 +344,6 @@ void gfxDrawTriangle(const void *a, const void *b, const void *c)
WriteTrace(TraceGlitch, TraceDebug, "Done");
}
FX_ENTRY void FX_CALL
grDrawPoint(const void *pt)
{
}
FX_ENTRY void FX_CALL
grDrawLine(const void *a, const void *b)
{

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

@ -442,64 +442,6 @@ void gfxDrawTriangle(const void *a, const void *b, const void *c)
grDisplayGLError("gfxDrawTriangle");
}
FX_ENTRY void FX_CALL
grDrawPoint(const void *pt)
{
float *x = (float*)pt + xy_off / sizeof(float);
float *y = (float*)pt + xy_off / sizeof(float) + 1;
float *z = (float*)pt + z_off / sizeof(float);
float *q = (float*)pt + q_off / sizeof(float);
unsigned char *pargb = (unsigned char*)pt + pargb_off;
float *s0 = (float*)pt + st0_off / sizeof(float);
float *t0 = (float*)pt + st0_off / sizeof(float) + 1;
float *s1 = (float*)pt + st1_off / sizeof(float);
float *t1 = (float*)pt + st1_off / sizeof(float) + 1;
float *fog = (float*)pt + fog_ext_off / sizeof(float);
WriteTrace(TraceGlitch, TraceDebug, "-");
if (nvidia_viewport_hack && !render_to_texture)
{
glViewport(0, g_viewport_offset, viewport_width, viewport_height);
nvidia_viewport_hack = 0;
}
reloadTexture();
if (need_to_compile) compile_shader();
glBegin(GL_POINTS);
if (nbTextureUnits > 2)
{
if (st0_en)
glMultiTexCoord2fARB(GL_TEXTURE1_ARB, *s0 / *q / (float)tex1_width,
ytex(0, *t0 / *q / (float)tex1_height));
if (st1_en)
glMultiTexCoord2fARB(GL_TEXTURE0_ARB, *s1 / *q / (float)tex0_width,
ytex(1, *t1 / *q / (float)tex0_height));
}
else
{
if (st0_en)
glTexCoord2f(*s0 / *q / (float)tex0_width,
ytex(0, *t0 / *q / (float)tex0_height));
}
if (pargb_en)
glColor4f(pargb[2] / 255.0f, pargb[1] / 255.0f, pargb[0] / 255.0f, pargb[3] / 255.0f);
if (fog_enabled && fog_coord_support)
{
if (!fog_ext_en || fog_enabled != 2)
glSecondaryColor3f((1.0f / *q) / 255.0f, 0.0f, 0.0f);
else
glSecondaryColor3f((1.0f / *fog) / 255.0f, 0.0f, 0.0f);
}
glVertex4f((*x - (float)widtho) / (float)(g_width / 2) / *q,
-(*y - (float)heighto) / (float)(g_height / 2) / *q, ZCALC(*z, *q), 1.0f / *q);
glEnd();
grDisplayGLError("grDrawPoint");
}
FX_ENTRY void FX_CALL
grDrawLine(const void *a, const void *b)
{