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

Fix warnings on MacOS builds that were caused by [10179]. 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10183 4a71c877-e1ca-e34f-864e-861f7616d084
master
i-nod 2010-03-06 23:54:11 +00:00 committed by Git SVN Gateway
parent 9e3cde7a7a
commit 5c64a642a4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ivis_opengl/piestate.c
View File

@ -78,7 +78,7 @@ static char *readShaderBuf(const char *name)
// Retrieve shader compilation errors // Retrieve shader compilation errors
static void printShaderInfoLog(GLuint shader) static void printShaderInfoLog(GLuint shader)
{ {
int infologLen = 0; GLint infologLen = 0;
glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infologLen); glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infologLen);
if (infologLen > 0) if (infologLen > 0)
@ -95,7 +95,7 @@ static void printShaderInfoLog(GLuint shader)
// Retrieve shader linkage errors // Retrieve shader linkage errors
static void printProgramInfoLog(GLuint program) static void printProgramInfoLog(GLuint program)
{ {
int infologLen = 0; GLint infologLen = 0;
glGetProgramiv(program, GL_INFO_LOG_LENGTH, &infologLen); glGetProgramiv(program, GL_INFO_LOG_LENGTH, &infologLen);
if (infologLen > 0) if (infologLen > 0)

4
lib/ivis_opengl/screen.c
View File

@ -199,7 +199,7 @@ bool screenInitialise(
debug(LOG_3D, " * Vertex Buffer Object (VBO) %s supported.", GL_ARB_vertex_buffer_object ? "is" : "is NOT"); debug(LOG_3D, " * Vertex Buffer Object (VBO) %s supported.", GL_ARB_vertex_buffer_object ? "is" : "is NOT");
glGetIntegerv(GL_MAX_TEXTURE_UNITS, &glMaxTUs); glGetIntegerv(GL_MAX_TEXTURE_UNITS, &glMaxTUs);
debug(LOG_3D, " * Total number of Texture Units (TUs) supported is %d.", glMaxTUs); debug(LOG_3D, " * Total number of Texture Units (TUs) supported is %d.", (int) glMaxTUs);
if (!GLEE_VERSION_1_4) if (!GLEE_VERSION_1_4)
{ {
@ -240,7 +240,7 @@ bool screenInitialise(
addDumpInfo(buf); addDumpInfo(buf);
glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &glMaxTIUs); glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &glMaxTIUs);
debug(LOG_3D, " * Total number of Texture Image Units (TIUs) supported is %d.", glMaxTIUs); debug(LOG_3D, " * Total number of Texture Image Units (TIUs) supported is %d.", (int) glMaxTIUs);
if (!pie_LoadShaders()) if (!pie_LoadShaders())
debug(LOG_WARNING, "Can't use shaders! Switching back to fixed pipeline...");; debug(LOG_WARNING, "Can't use shaders! Switching back to fixed pipeline...");;