fte/fteqw
2
0
Fork 1
Code Issues Pull requests Releases 1 Activity Actions

misc compile fixes.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4103 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2012-08-04 12:27:24 +00:00
parent 8ba09bac40
commit d44b546b10
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engine/Makefile
View file

@ -455,7 +455,6 @@ CLIENT_OBJS = \
GLQUAKE_OBJS = \ GLQUAKE_OBJS = \
gl_draw.o \ gl_draw.o \
gl_ngraph.o \
gl_backend.o \ gl_backend.o \
gl_rmain.o \ gl_rmain.o \
gl_rmisc.o \ gl_rmisc.o \
@ -473,6 +472,7 @@ D3DQUAKE_OBJS = \
D3DGL_OBJS = \ D3DGL_OBJS = \
gl_font.o \ gl_font.o \
gl_ngraph.o \
gl_model.o \ gl_model.o \
gl_shader.o \ gl_shader.o \
gl_shadow.o \ gl_shadow.o \

8
engine/gl/gl_backend.c
View file

@ -4267,7 +4267,8 @@ void GLBE_DrawWorld (qboolean drawworld, qbyte *vis)
} }
*/ */
if (r_wireframe.ival) #ifdef GL_LINE //no gles
if (r_wireframe.ival && qglPolygonMode)
{ {
BE_SelectMode(BEM_WIREFRAME); BE_SelectMode(BEM_WIREFRAME);
qglPolygonMode(GL_FRONT_AND_BACK, GL_LINE); qglPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
@ -4275,12 +4276,14 @@ void GLBE_DrawWorld (qboolean drawworld, qbyte *vis)
BE_SelectMode(BEM_STANDARD); BE_SelectMode(BEM_STANDARD);
qglPolygonMode(GL_FRONT_AND_BACK, GL_FILL); qglPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
} }
#endif
} }
else else
{ {
GLBE_SubmitMeshes(false, SHADER_SORT_PORTAL, SHADER_SORT_NEAREST); GLBE_SubmitMeshes(false, SHADER_SORT_PORTAL, SHADER_SORT_NEAREST);
if (r_wireframe.ival) #ifdef GL_LINE //no gles
if (r_wireframe.ival && qglPolygonMode)
{ {
BE_SelectMode(BEM_WIREFRAME); BE_SelectMode(BEM_WIREFRAME);
qglPolygonMode(GL_FRONT_AND_BACK, GL_LINE); qglPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
@ -4288,6 +4291,7 @@ void GLBE_DrawWorld (qboolean drawworld, qbyte *vis)
BE_SelectMode(BEM_STANDARD); BE_SelectMode(BEM_STANDARD);
qglPolygonMode(GL_FRONT_AND_BACK, GL_FILL); qglPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
} }
#endif
} }
BE_SelectEntity(&r_worldentity); BE_SelectEntity(&r_worldentity);