Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Warning linting on Mac OS X 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1570 4a71c877-e1ca-e34f-864e-861f7616d084
master
Ari Johnson 2007-04-30 20:42:18 +00:00
parent bf0a74258a
commit d84e7fbf27
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ivis_opengl/piedraw.c
View File

@ -94,7 +94,9 @@ BOOL check_extension(const char* extension_name)
typedef void (APIENTRY * PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
#endif
#ifndef WZ_OS_MAC
PFNGLACTIVESTENCILFACEEXTPROC glActiveStencilFaceEXT;
#endif
/// Check if we can use one-pass stencil in the shadow draw code
static BOOL stencil_one_pass(void)
@ -106,6 +108,9 @@ static BOOL stencil_one_pass(void)
can_do_stencil_one_pass = 0; // can't use it until we decide otherwise
// let's check if we have the needed extensions
#ifdef WZ_OS_MAC
can_do_stencil_one_pass = 1;
#else
if( check_extension("GL_EXT_stencil_two_side")
&& check_extension("GL_EXT_stencil_wrap"))
{
@ -117,6 +122,7 @@ static BOOL stencil_one_pass(void)
can_do_stencil_one_pass = 1;
}
}
#endif /* WZ_OS_MAC */
}
return (1 == can_do_stencil_one_pass); // to get the types right

2
lib/ivis_opengl/tex.c
View File

@ -90,7 +90,7 @@ int pie_AddTexPage(iTexture* s, const char* filename, int type, BOOL bResource)
_TEX_PAGE[i].tex.height = s->height;
_TEX_PAGE[i].type = type;
glGenTextures(1, &_TEX_PAGE[i].id);
glGenTextures(1, (GLuint *) &_TEX_PAGE[i].id);
glBindTexture(GL_TEXTURE_2D, _TEX_PAGE[i].id);
if ((s->width & (s->width-1)) == 0 && (s->height & (s->height-1)) == 0)