From ceca8dd69503cd443d5a461c1a620a50b0556158 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Fri, 26 Sep 2014 12:52:38 -0700 Subject: [PATCH] fix world rendering on windows --- quakespasm/Quake/r_alias.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/quakespasm/Quake/r_alias.c b/quakespasm/Quake/r_alias.c index d5585e08..6b2f6769 100644 --- a/quakespasm/Quake/r_alias.c +++ b/quakespasm/Quake/r_alias.c @@ -266,16 +266,21 @@ void GL_DrawAliasFrame (aliashdr_t *paliashdr, lerpdata_t lerpdata) // glEnable(GL_TEXTURE_2D); glDrawElements(GL_TRIANGLES, paliashdr->numindexes, GL_UNSIGNED_SHORT, (void *)paliashdr->vboindexofs); - - glDisableClientState (GL_VERTEX_ARRAY); - GL_ClientActiveTextureFunc (GL_TEXTURE0_ARB); - glDisableClientState (GL_TEXTURE_COORD_ARRAY); - GL_ClientActiveTextureFunc (GL_TEXTURE1_ARB); - glDisableClientState (GL_TEXTURE_COORD_ARRAY); - GL_ClientActiveTextureFunc (GL_TEXTURE2_ARB); - glDisableClientState (GL_TEXTURE_COORD_ARRAY); - glDisableClientState (GL_NORMAL_ARRAY); - + GL_DisableVertexAttribArrayFunc(pose1VertexAttrIndex); + GL_DisableVertexAttribArrayFunc(pose2VertexAttrIndex); + + GL_ClientActiveTextureFunc(GL_TEXTURE0_ARB); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); + + GL_ClientActiveTextureFunc(GL_TEXTURE1_ARB); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); + + GL_ClientActiveTextureFunc(GL_TEXTURE2_ARB); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); + + GL_DisableVertexAttribArrayFunc(pose1NormalAttrIndex); + GL_DisableVertexAttribArrayFunc(pose2NormalAttrIndex); + GL_UseProgramFunc(0); return;