fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-15 16:41:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add some guards around new glsl aliasmodel code

Browse source
This commit is contained in:
Eric Wasylishen 2014-09-28 00:41:34 -06:00
parent c1923dc909
commit 3483a74c91
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
quakespasm/Quake/gl_mesh.c
View file

@ -360,6 +360,9 @@ void GL_MakeAliasModelDisplayLists_VBO (void)
int i, j;
int maxverts_vbo;
if (!gl_glsl_able)
return;
// ericw -- first, copy the verts onto the hunk
trivertx_t *verts;
@ -454,6 +457,9 @@ void GLMesh_LoadVertexBuffers (void)
int totalindexes = 0;
int totalvbosize = 0;
if (!gl_glsl_able)
return;
// pass 1 - count the sizes we need
for (j = 1; j < MAX_MODELS; j++)
{

4
quakespasm/Quake/r_alias.c
View file

@ -285,8 +285,12 @@ void GL_DrawAliasFrame (aliashdr_t *paliashdr, lerpdata_t lerpdata)
float blend, iblend;
qboolean lerping;
// call fast path if possible
if (gl_glsl_able && !r_drawflat_cheatsafe && shading)
{
GL_DrawAliasFrame_GLSL (paliashdr, lerpdata);
return;
}
if (lerpdata.pose1 != lerpdata.pose2)
{