From 9daba0e39907f6a4bc4fbdb45a11f60768216150 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Wed, 22 Oct 2014 23:43:29 -0600 Subject: [PATCH] Coding style for GL_ARB_vertex_program function pointers --- quakespasm/Quake/gl_vidsdl.c | 115 +++++++++++++++++++---------------- quakespasm/Quake/glquake.h | 53 ++++++++-------- quakespasm/Quake/r_alias.c | 44 +++++++------- 3 files changed, 109 insertions(+), 103 deletions(-) diff --git a/quakespasm/Quake/gl_vidsdl.c b/quakespasm/Quake/gl_vidsdl.c index 945859e1..cce99bcf 100644 --- a/quakespasm/Quake/gl_vidsdl.c +++ b/quakespasm/Quake/gl_vidsdl.c @@ -108,29 +108,29 @@ PFNGLDELETEBUFFERSARBPROC GL_DeleteBuffersFunc = NULL; //ericw PFNGLGENBUFFERSARBPROC GL_GenBuffersFunc = NULL; //ericw // vertex/fragment program -PFNGLBINDPROGRAMARBPROC qglBindProgramARB = NULL; -PFNGLDELETEPROGRAMSARBPROC qglDeleteProgramsARB = NULL; -PFNGLGENPROGRAMSARBPROC qglGenProgramsARB = NULL; -PFNGLGETPROGRAMENVPARAMETERDVARBPROC qglGetProgramEnvParameterdvARB = NULL; -PFNGLGETPROGRAMENVPARAMETERFVARBPROC qglGetProgramEnvParameterfvARB = NULL; -PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC qglGetProgramLocalParameterdvARB = NULL; -PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC qglGetProgramLocalParameterfvARB = NULL; -PFNGLGETPROGRAMSTRINGARBPROC qglGetProgramStringARB = NULL; -PFNGLGETPROGRAMIVARBPROC qglGetProgramivARB = NULL; -PFNGLISPROGRAMARBPROC qglIsProgramARB = NULL; -PFNGLPROGRAMENVPARAMETER4DARBPROC qglProgramEnvParameter4dARB = NULL; -PFNGLPROGRAMENVPARAMETER4DVARBPROC qglProgramEnvParameter4dvARB = NULL; -PFNGLPROGRAMENVPARAMETER4FARBPROC qglProgramEnvParameter4fARB = NULL; -PFNGLPROGRAMENVPARAMETER4FVARBPROC qglProgramEnvParameter4fvARB = NULL; -PFNGLPROGRAMLOCALPARAMETER4DARBPROC qglProgramLocalParameter4dARB = NULL; -PFNGLPROGRAMLOCALPARAMETER4DVARBPROC qglProgramLocalParameter4dvARB = NULL; -PFNGLPROGRAMLOCALPARAMETER4FARBPROC qglProgramLocalParameter4fARB = NULL; -PFNGLPROGRAMLOCALPARAMETER4FVARBPROC qglProgramLocalParameter4fvARB = NULL; -PFNGLPROGRAMSTRINGARBPROC qglProgramStringARB = NULL; +PFNGLBINDPROGRAMARBPROC GL_BindProgramARBFunc = NULL; +PFNGLDELETEPROGRAMSARBPROC GL_DeleteProgramsARBFunc = NULL; +PFNGLGENPROGRAMSARBPROC GL_GenProgramsARBFunc = NULL; +PFNGLGETPROGRAMENVPARAMETERDVARBPROC GL_GetProgramEnvParameterdvARBFunc = NULL; +PFNGLGETPROGRAMENVPARAMETERFVARBPROC GL_GetProgramEnvParameterfvARBFunc = NULL; +PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC GL_GetProgramLocalParameterdvARBFunc = NULL; +PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC GL_GetProgramLocalParameterfvARBFunc = NULL; +PFNGLGETPROGRAMSTRINGARBPROC GL_GetProgramStringARBFunc = NULL; +PFNGLGETPROGRAMIVARBPROC GL_GetProgramivARBFunc = NULL; +PFNGLISPROGRAMARBPROC GL_IsProgramARBFunc = NULL; +PFNGLPROGRAMENVPARAMETER4DARBPROC GL_ProgramEnvParameter4dARBFunc = NULL; +PFNGLPROGRAMENVPARAMETER4DVARBPROC GL_ProgramEnvParameter4dvARBFunc = NULL; +PFNGLPROGRAMENVPARAMETER4FARBPROC GL_ProgramEnvParameter4fARBFunc = NULL; +PFNGLPROGRAMENVPARAMETER4FVARBPROC GL_ProgramEnvParameter4fvARBFunc = NULL; +PFNGLPROGRAMLOCALPARAMETER4DARBPROC GL_ProgramLocalParameter4dARBFunc = NULL; +PFNGLPROGRAMLOCALPARAMETER4DVARBPROC GL_ProgramLocalParameter4dvARBFunc = NULL; +PFNGLPROGRAMLOCALPARAMETER4FARBPROC GL_ProgramLocalParameter4fARBFunc = NULL; +PFNGLPROGRAMLOCALPARAMETER4FVARBPROC GL_ProgramLocalParameter4fvARBFunc = NULL; +PFNGLPROGRAMSTRINGARBPROC GL_ProgramStringARBFunc = NULL; -PFNGLVERTEXATTRIBPOINTERARBPROC qglVertexAttribPointerARB = NULL; -PFNGLENABLEVERTEXATTRIBARRAYARBPROC qglEnableVertexAttribArrayARB = NULL; -PFNGLDISABLEVERTEXATTRIBARRAYARBPROC qglDisableVertexAttribArrayARB = NULL; +PFNGLVERTEXATTRIBPOINTERARBPROC GL_VertexAttribPointerARBFunc = NULL; +PFNGLENABLEVERTEXATTRIBARRAYARBPROC GL_EnableVertexAttribArrayARBFunc = NULL; +PFNGLDISABLEVERTEXATTRIBARRAYARBPROC GL_DisableVertexAttribArrayARBFunc = NULL; //==================================== @@ -841,8 +841,8 @@ static void GL_CheckExtensions (void) // if (COM_CheckParm("-novbo")) Con_Warning ("Vertex buffer objects disabled at command line\n"); -// else if (gl_version_major < 1 || (gl_version_major == 1 && gl_version_minor < 5)) -// Con_Warning ("OpenGL version < 1.5, skipping ARB_vertex_buffer_object check\n"); + else if (gl_version_major < 1 || (gl_version_major == 1 && gl_version_minor < 5)) + Con_Warning ("OpenGL version < 1.5, skipping ARB_vertex_buffer_object check\n"); else { GL_BindBufferFunc = (PFNGLBINDBUFFERARBPROC) SDL_GL_GetProcAddress("glBindBufferARB"); @@ -1019,37 +1019,46 @@ static void GL_CheckExtensions (void) Con_Warning ("texture_non_power_of_two not supported\n"); } - // gl_arb_vp - - if (!(qglBindProgramARB = (PFNGLBINDPROGRAMARBPROC) SDL_GL_GetProcAddress ("glBindProgramARB"))) return; - if (!(qglDeleteProgramsARB = (PFNGLDELETEPROGRAMSARBPROC) SDL_GL_GetProcAddress ("glDeleteProgramsARB"))) return; - if (!(qglGenProgramsARB = (PFNGLGENPROGRAMSARBPROC) SDL_GL_GetProcAddress ("glGenProgramsARB"))) return; - if (!(qglGetProgramEnvParameterdvARB = (PFNGLGETPROGRAMENVPARAMETERDVARBPROC) SDL_GL_GetProcAddress ("glGetProgramEnvParameterdvARB"))) return; - if (!(qglGetProgramEnvParameterfvARB = (PFNGLGETPROGRAMENVPARAMETERFVARBPROC) SDL_GL_GetProcAddress ("glGetProgramEnvParameterfvARB"))) return; - if (!(qglGetProgramLocalParameterdvARB = (PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) SDL_GL_GetProcAddress ("glGetProgramLocalParameterdvARB"))) return; - if (!(qglGetProgramLocalParameterfvARB = (PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) SDL_GL_GetProcAddress ("glGetProgramLocalParameterfvARB"))) return; - if (!(qglGetProgramStringARB = (PFNGLGETPROGRAMSTRINGARBPROC) SDL_GL_GetProcAddress ("glGetProgramStringARB"))) return; - if (!(qglGetProgramivARB = (PFNGLGETPROGRAMIVARBPROC) SDL_GL_GetProcAddress ("glGetProgramivARB"))) return; - if (!(qglIsProgramARB = (PFNGLISPROGRAMARBPROC) SDL_GL_GetProcAddress ("glIsProgramARB"))) return; - if (!(qglProgramEnvParameter4dARB = (PFNGLPROGRAMENVPARAMETER4DARBPROC) SDL_GL_GetProcAddress ("glProgramEnvParameter4dARB"))) return; - if (!(qglProgramEnvParameter4dvARB = (PFNGLPROGRAMENVPARAMETER4DVARBPROC) SDL_GL_GetProcAddress ("glProgramEnvParameter4dvARB"))) return; - if (!(qglProgramEnvParameter4fARB = (PFNGLPROGRAMENVPARAMETER4FARBPROC) SDL_GL_GetProcAddress ("glProgramEnvParameter4fARB"))) return; - if (!(qglProgramEnvParameter4fvARB = (PFNGLPROGRAMENVPARAMETER4FVARBPROC) SDL_GL_GetProcAddress ("glProgramEnvParameter4fvARB"))) return; - if (!(qglProgramLocalParameter4dARB = (PFNGLPROGRAMLOCALPARAMETER4DARBPROC) SDL_GL_GetProcAddress ("glProgramLocalParameter4dARB"))) return; - if (!(qglProgramLocalParameter4dvARB = (PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) SDL_GL_GetProcAddress ("glProgramLocalParameter4dvARB"))) return; - if (!(qglProgramLocalParameter4fARB = (PFNGLPROGRAMLOCALPARAMETER4FARBPROC) SDL_GL_GetProcAddress ("glProgramLocalParameter4fARB"))) return; - if (!(qglProgramLocalParameter4fvARB = (PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) SDL_GL_GetProcAddress ("glProgramLocalParameter4fvARB"))) return; - if (!(qglProgramStringARB = (PFNGLPROGRAMSTRINGARBPROC) SDL_GL_GetProcAddress ("glProgramStringARB"))) return; - if (!(qglVertexAttribPointerARB = (PFNGLVERTEXATTRIBPOINTERARBPROC) SDL_GL_GetProcAddress ("glVertexAttribPointerARB"))) return; - if (!(qglEnableVertexAttribArrayARB = (PFNGLENABLEVERTEXATTRIBARRAYARBPROC) SDL_GL_GetProcAddress ("glEnableVertexAttribArrayARB"))) return; - if (!(qglDisableVertexAttribArrayARB = (PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) SDL_GL_GetProcAddress ("glDisableVertexAttribArrayARB"))) return; - - if (COM_CheckParm("-novp")) - Con_Warning ("vp disabled at command line\n"); + // GL_ARB_vertex_program + // + if (COM_CheckParm("-novertexprogram")) + Con_Warning ("GL_ARB_vertex_program disabled at command line\n"); else { - Con_Printf("FOUND: gl_arb_vp\n"); - gl_arb_vp_able = true; + qboolean ok = true; + + if (!(GL_BindProgramARBFunc = (PFNGLBINDPROGRAMARBPROC) SDL_GL_GetProcAddress ("glBindProgramARB"))) ok = false; + if (!(GL_DeleteProgramsARBFunc = (PFNGLDELETEPROGRAMSARBPROC) SDL_GL_GetProcAddress ("glDeleteProgramsARB"))) ok = false; + if (!(GL_GenProgramsARBFunc = (PFNGLGENPROGRAMSARBPROC) SDL_GL_GetProcAddress ("glGenProgramsARB"))) ok = false; + if (!(GL_GetProgramEnvParameterdvARBFunc = (PFNGLGETPROGRAMENVPARAMETERDVARBPROC) SDL_GL_GetProcAddress ("glGetProgramEnvParameterdvARB"))) ok = false; + if (!(GL_GetProgramEnvParameterfvARBFunc = (PFNGLGETPROGRAMENVPARAMETERFVARBPROC) SDL_GL_GetProcAddress ("glGetProgramEnvParameterfvARB"))) ok = false; + if (!(GL_GetProgramLocalParameterdvARBFunc = (PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) SDL_GL_GetProcAddress ("glGetProgramLocalParameterdvARB"))) ok = false; + if (!(GL_GetProgramLocalParameterfvARBFunc = (PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) SDL_GL_GetProcAddress ("glGetProgramLocalParameterfvARB"))) ok = false; + if (!(GL_GetProgramStringARBFunc = (PFNGLGETPROGRAMSTRINGARBPROC) SDL_GL_GetProcAddress ("glGetProgramStringARB"))) ok = false; + if (!(GL_GetProgramivARBFunc = (PFNGLGETPROGRAMIVARBPROC) SDL_GL_GetProcAddress ("glGetProgramivARB"))) ok = false; + if (!(GL_IsProgramARBFunc = (PFNGLISPROGRAMARBPROC) SDL_GL_GetProcAddress ("glIsProgramARB"))) ok = false; + if (!(GL_ProgramEnvParameter4dARBFunc = (PFNGLPROGRAMENVPARAMETER4DARBPROC) SDL_GL_GetProcAddress ("glProgramEnvParameter4dARB"))) ok = false; + if (!(GL_ProgramEnvParameter4dvARBFunc = (PFNGLPROGRAMENVPARAMETER4DVARBPROC) SDL_GL_GetProcAddress ("glProgramEnvParameter4dvARB"))) ok = false; + if (!(GL_ProgramEnvParameter4fARBFunc = (PFNGLPROGRAMENVPARAMETER4FARBPROC) SDL_GL_GetProcAddress ("glProgramEnvParameter4fARB"))) ok = false; + if (!(GL_ProgramEnvParameter4fvARBFunc = (PFNGLPROGRAMENVPARAMETER4FVARBPROC) SDL_GL_GetProcAddress ("glProgramEnvParameter4fvARB"))) ok = false; + if (!(GL_ProgramLocalParameter4dARBFunc = (PFNGLPROGRAMLOCALPARAMETER4DARBPROC) SDL_GL_GetProcAddress ("glProgramLocalParameter4dARB"))) ok = false; + if (!(GL_ProgramLocalParameter4dvARBFunc = (PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) SDL_GL_GetProcAddress ("glProgramLocalParameter4dvARB"))) ok = false; + if (!(GL_ProgramLocalParameter4fARBFunc = (PFNGLPROGRAMLOCALPARAMETER4FARBPROC) SDL_GL_GetProcAddress ("glProgramLocalParameter4fARB"))) ok = false; + if (!(GL_ProgramLocalParameter4fvARBFunc = (PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) SDL_GL_GetProcAddress ("glProgramLocalParameter4fvARB"))) ok = false; + if (!(GL_ProgramStringARBFunc = (PFNGLPROGRAMSTRINGARBPROC) SDL_GL_GetProcAddress ("glProgramStringARB"))) ok = false; + if (!(GL_VertexAttribPointerARBFunc = (PFNGLVERTEXATTRIBPOINTERARBPROC) SDL_GL_GetProcAddress ("glVertexAttribPointerARB"))) ok = false; + if (!(GL_EnableVertexAttribArrayARBFunc = (PFNGLENABLEVERTEXATTRIBARRAYARBPROC) SDL_GL_GetProcAddress ("glEnableVertexAttribArrayARB"))) ok = false; + if (!(GL_DisableVertexAttribArrayARBFunc = (PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) SDL_GL_GetProcAddress ("glDisableVertexAttribArrayARB"))) ok = false; + + if (ok) + { + Con_Printf("FOUND: GL_ARB_vertex_program\n"); + gl_arb_vp_able = true; + } + else + { + Con_Warning ("GL_ARB_vertex_program not available\n"); + } } } diff --git a/quakespasm/Quake/glquake.h b/quakespasm/Quake/glquake.h index 1d7c50b0..d77c78a5 100644 --- a/quakespasm/Quake/glquake.h +++ b/quakespasm/Quake/glquake.h @@ -173,36 +173,33 @@ extern PFNGLGENBUFFERSARBPROC GL_GenBuffersFunc; extern qboolean gl_vbo_able; //ericw -//ericw -- GLSL +// ericw -- GL_ARB_vertex_program +extern PFNGLBINDPROGRAMARBPROC GL_BindProgramARBFunc; +extern PFNGLDELETEPROGRAMSARBPROC GL_DeleteProgramsARBFunc; +extern PFNGLGENPROGRAMSARBPROC GL_GenProgramsARBFunc; +extern PFNGLGETPROGRAMENVPARAMETERDVARBPROC GL_GetProgramEnvParameterdvARBFunc; +extern PFNGLGETPROGRAMENVPARAMETERFVARBPROC GL_GetProgramEnvParameterfvARBFunc; +extern PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC GL_GetProgramLocalParameterdvARBFunc; +extern PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC GL_GetProgramLocalParameterfvARBFunc; +extern PFNGLGETPROGRAMSTRINGARBPROC GL_GetProgramStringARBFunc; +extern PFNGLGETPROGRAMIVARBPROC GL_GetProgramivARBFunc; +extern PFNGLISPROGRAMARBPROC GL_IsProgramARBFunc; +extern PFNGLPROGRAMENVPARAMETER4DARBPROC GL_ProgramEnvParameter4dARBFunc; +extern PFNGLPROGRAMENVPARAMETER4DVARBPROC GL_ProgramEnvParameter4dvARBFunc; +extern PFNGLPROGRAMENVPARAMETER4FARBPROC GL_ProgramEnvParameter4fARBFunc; +extern PFNGLPROGRAMENVPARAMETER4FVARBPROC GL_ProgramEnvParameter4fvARBFunc; +extern PFNGLPROGRAMLOCALPARAMETER4DARBPROC GL_ProgramLocalParameter4dARBFunc; +extern PFNGLPROGRAMLOCALPARAMETER4DVARBPROC GL_ProgramLocalParameter4dvARBFunc; +extern PFNGLPROGRAMLOCALPARAMETER4FARBPROC GL_ProgramLocalParameter4fARBFunc; +extern PFNGLPROGRAMLOCALPARAMETER4FVARBPROC GL_ProgramLocalParameter4fvARBFunc; +extern PFNGLPROGRAMSTRINGARBPROC GL_ProgramStringARBFunc; + +extern PFNGLVERTEXATTRIBPOINTERARBPROC GL_VertexAttribPointerARBFunc; +extern PFNGLENABLEVERTEXATTRIBARRAYARBPROC GL_EnableVertexAttribArrayARBFunc; +extern PFNGLDISABLEVERTEXATTRIBARRAYARBPROC GL_DisableVertexAttribArrayARBFunc; extern qboolean gl_arb_vp_able; -// ericw -- - -// vertex/fragment program -extern PFNGLBINDPROGRAMARBPROC qglBindProgramARB; -extern PFNGLDELETEPROGRAMSARBPROC qglDeleteProgramsARB; -extern PFNGLGENPROGRAMSARBPROC qglGenProgramsARB; -extern PFNGLGETPROGRAMENVPARAMETERDVARBPROC qglGetProgramEnvParameterdvARB; -extern PFNGLGETPROGRAMENVPARAMETERFVARBPROC qglGetProgramEnvParameterfvARB; -extern PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC qglGetProgramLocalParameterdvARB; -extern PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC qglGetProgramLocalParameterfvARB; -extern PFNGLGETPROGRAMSTRINGARBPROC qglGetProgramStringARB; -extern PFNGLGETPROGRAMIVARBPROC qglGetProgramivARB; -extern PFNGLISPROGRAMARBPROC qglIsProgramARB; -extern PFNGLPROGRAMENVPARAMETER4DARBPROC qglProgramEnvParameter4dARB; -extern PFNGLPROGRAMENVPARAMETER4DVARBPROC qglProgramEnvParameter4dvARB; -extern PFNGLPROGRAMENVPARAMETER4FARBPROC qglProgramEnvParameter4fARB; -extern PFNGLPROGRAMENVPARAMETER4FVARBPROC qglProgramEnvParameter4fvARB; -extern PFNGLPROGRAMLOCALPARAMETER4DARBPROC qglProgramLocalParameter4dARB; -extern PFNGLPROGRAMLOCALPARAMETER4DVARBPROC qglProgramLocalParameter4dvARB; -extern PFNGLPROGRAMLOCALPARAMETER4FARBPROC qglProgramLocalParameter4fARB; -extern PFNGLPROGRAMLOCALPARAMETER4FVARBPROC qglProgramLocalParameter4fvARB; -extern PFNGLPROGRAMSTRINGARBPROC qglProgramStringARB; - -extern PFNGLVERTEXATTRIBPOINTERARBPROC qglVertexAttribPointerARB; -extern PFNGLENABLEVERTEXATTRIBARRAYARBPROC qglEnableVertexAttribArrayARB; -extern PFNGLDISABLEVERTEXATTRIBARRAYARBPROC qglDisableVertexAttribArrayARB; - +//ericw -- //ericw -- NPOT texture support extern qboolean gl_texture_NPOT; diff --git a/quakespasm/Quake/r_alias.c b/quakespasm/Quake/r_alias.c index 82854691..c18f6a94 100644 --- a/quakespasm/Quake/r_alias.c +++ b/quakespasm/Quake/r_alias.c @@ -94,11 +94,11 @@ GLuint GL_CreateProgram (const GLchar *source) const GLubyte *errString; GLenum errGLErr; - qglGenProgramsARB (1, &progid); - qglBindProgramARB (GL_VERTEX_PROGRAM_ARB, progid); + GL_GenProgramsARBFunc (1, &progid); + GL_BindProgramARBFunc (GL_VERTEX_PROGRAM_ARB, progid); errGLErr = glGetError (); - qglProgramStringARB (GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen (source), source); + GL_ProgramStringARBFunc (GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen (source), source); errGLErr = glGetError (); // Find the error position @@ -112,8 +112,8 @@ GLuint GL_CreateProgram (const GLchar *source) if ((errPos != -1) || (errString && errString[0]) || (errGLErr != GL_NO_ERROR)) { Con_Printf ("Program:\n%s\n", source); - qglDeleteProgramsARB (1, &progid); - qglBindProgramARB (GL_VERTEX_PROGRAM_ARB, 0); + GL_DeleteProgramsARBFunc (1, &progid); + GL_BindProgramARBFunc (GL_VERTEX_PROGRAM_ARB, 0); return 0; } else @@ -121,7 +121,7 @@ GLuint GL_CreateProgram (const GLchar *source) // gl_arb_programs[gl_num_arb_programs] = progid; // gl_num_arb_programs++; - qglBindProgramARB (GL_VERTEX_PROGRAM_ARB, 0); + GL_BindProgramARBFunc (GL_VERTEX_PROGRAM_ARB, 0); return progid; } } @@ -176,18 +176,18 @@ void GL_DrawAliasFrame_ARB (aliashdr_t *paliashdr, lerpdata_t lerpdata) const GLint pose2VertexAttrIndex = 2; const GLint pose2NormalAttrIndex = 3; - qglBindProgramARB (GL_VERTEX_PROGRAM_ARB, shader); + GL_BindProgramARBFunc (GL_VERTEX_PROGRAM_ARB, shader); glEnable ( GL_VERTEX_PROGRAM_ARB ); // ericw -- bind it and stuff GL_BindBufferFunc (GL_ARRAY_BUFFER, r_meshvbo); GL_BindBufferFunc (GL_ELEMENT_ARRAY_BUFFER, r_meshindexesvbo); - qglVertexAttribPointerARB (pose1VertexAttrIndex, 4, GL_UNSIGNED_BYTE, GL_FALSE, sizeof (meshxyz_t), GLARB_GetXYZOffset (paliashdr, lerpdata.pose1)); - qglEnableVertexAttribArrayARB (pose1VertexAttrIndex); + GL_VertexAttribPointerARBFunc (pose1VertexAttrIndex, 4, GL_UNSIGNED_BYTE, GL_FALSE, sizeof (meshxyz_t), GLARB_GetXYZOffset (paliashdr, lerpdata.pose1)); + GL_EnableVertexAttribArrayARBFunc (pose1VertexAttrIndex); - qglVertexAttribPointerARB (pose2VertexAttrIndex, 4, GL_UNSIGNED_BYTE, GL_FALSE, sizeof (meshxyz_t), GLARB_GetXYZOffset (paliashdr, lerpdata.pose2)); - qglEnableVertexAttribArrayARB (pose2VertexAttrIndex); + GL_VertexAttribPointerARBFunc (pose2VertexAttrIndex, 4, GL_UNSIGNED_BYTE, GL_FALSE, sizeof (meshxyz_t), GLARB_GetXYZOffset (paliashdr, lerpdata.pose2)); + GL_EnableVertexAttribArrayARBFunc (pose2VertexAttrIndex); GL_ClientActiveTextureFunc (GL_TEXTURE0_ARB); glTexCoordPointer (2, GL_FLOAT, 0, (void *)(intptr_t)currententity->model->vbostofs); @@ -200,17 +200,17 @@ void GL_DrawAliasFrame_ARB (aliashdr_t *paliashdr, lerpdata_t lerpdata) glDisableClientState (GL_TEXTURE_COORD_ARRAY); // GL_TRUE to normalize the signed bytes to [-1 .. 1] - qglVertexAttribPointerARB (pose1NormalAttrIndex, 3, GL_BYTE, GL_TRUE, sizeof (meshxyz_t), GLARB_GetNormalOffset (paliashdr, lerpdata.pose1)); - qglEnableVertexAttribArrayARB (pose1NormalAttrIndex); + GL_VertexAttribPointerARBFunc (pose1NormalAttrIndex, 3, GL_BYTE, GL_TRUE, sizeof (meshxyz_t), GLARB_GetNormalOffset (paliashdr, lerpdata.pose1)); + GL_EnableVertexAttribArrayARBFunc (pose1NormalAttrIndex); - qglVertexAttribPointerARB (pose2NormalAttrIndex, 3, GL_BYTE, GL_TRUE, sizeof (meshxyz_t), GLARB_GetNormalOffset (paliashdr, lerpdata.pose2)); - qglEnableVertexAttribArrayARB (pose2NormalAttrIndex); + GL_VertexAttribPointerARBFunc (pose2NormalAttrIndex, 3, GL_BYTE, GL_TRUE, sizeof (meshxyz_t), GLARB_GetNormalOffset (paliashdr, lerpdata.pose2)); + GL_EnableVertexAttribArrayARBFunc (pose2NormalAttrIndex); // set uniforms - qglProgramLocalParameter4fARB (GL_VERTEX_PROGRAM_ARB, blendLoc, blend, /* unused */ 0, 0, 0); - qglProgramLocalParameter4fARB (GL_VERTEX_PROGRAM_ARB, shadevectorLoc, shadevector[0], shadevector[1], shadevector[2], /* unused */ 0); - qglProgramLocalParameter4fARB (GL_VERTEX_PROGRAM_ARB, lightColorLoc, lightcolor[0], lightcolor[1], lightcolor[2], entalpha); + GL_ProgramLocalParameter4fARBFunc (GL_VERTEX_PROGRAM_ARB, blendLoc, blend, /* unused */ 0, 0, 0); + GL_ProgramLocalParameter4fARBFunc (GL_VERTEX_PROGRAM_ARB, shadevectorLoc, shadevector[0], shadevector[1], shadevector[2], /* unused */ 0); + GL_ProgramLocalParameter4fARBFunc (GL_VERTEX_PROGRAM_ARB, lightColorLoc, lightcolor[0], lightcolor[1], lightcolor[2], entalpha); // draw @@ -218,8 +218,8 @@ void GL_DrawAliasFrame_ARB (aliashdr_t *paliashdr, lerpdata_t lerpdata) // clean up - qglDisableVertexAttribArrayARB (pose1VertexAttrIndex); - qglDisableVertexAttribArrayARB (pose2VertexAttrIndex); + GL_DisableVertexAttribArrayARBFunc (pose1VertexAttrIndex); + GL_DisableVertexAttribArrayARBFunc (pose2VertexAttrIndex); GL_ClientActiveTextureFunc (GL_TEXTURE0_ARB); glDisableClientState (GL_TEXTURE_COORD_ARRAY); @@ -230,8 +230,8 @@ void GL_DrawAliasFrame_ARB (aliashdr_t *paliashdr, lerpdata_t lerpdata) GL_ClientActiveTextureFunc (GL_TEXTURE2_ARB); glDisableClientState (GL_TEXTURE_COORD_ARRAY); - qglDisableVertexAttribArrayARB (pose1NormalAttrIndex); - qglDisableVertexAttribArrayARB (pose2NormalAttrIndex); + GL_DisableVertexAttribArrayARBFunc (pose1NormalAttrIndex); + GL_DisableVertexAttribArrayARBFunc (pose2NormalAttrIndex); glDisable (GL_VERTEX_PROGRAM_ARB);