- merging in changes from weltall for macosx

This commit is contained in:
Mark Vejvoda
2011-10-18 01:13:38 +00:00
parent fa5aea7e42
commit 5b7329594c
14 changed files with 60 additions and 37 deletions

View File

@@ -139,31 +139,31 @@ const char *getGlPlatformExtensions() {
int getGlMaxLights() {
int i;
glGetIntegerv(GL_MAX_LIGHTS, &i);
glGetIntegerv(GL_MAX_LIGHTS, (GLint*)&i);
return i;
}
int getGlMaxTextureSize() {
int i;
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &i);
glGetIntegerv(GL_MAX_TEXTURE_SIZE, (GLint*)&i);
return i;
}
int getGlMaxTextureUnits() {
int i;
glGetIntegerv(GL_MAX_TEXTURE_UNITS, &i);
glGetIntegerv(GL_MAX_TEXTURE_UNITS, (GLint*)&i);
return i;
}
int getGlModelviewMatrixStackDepth() {
int i;
glGetIntegerv(GL_MAX_MODELVIEW_STACK_DEPTH, &i);
glGetIntegerv(GL_MAX_MODELVIEW_STACK_DEPTH, (GLint*)&i);
return i;
}
int getGlProjectionMatrixStackDepth() {
int i;
glGetIntegerv(GL_MAX_PROJECTION_STACK_DEPTH, &i);
glGetIntegerv(GL_MAX_PROJECTION_STACK_DEPTH, (GLint*)&i);
return i;
}