fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 07:18:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix minor warnings

Browse source
This commit is contained in:
Brian Paul 2003-04-21 14:50:12 +00:00
parent e5db876329
commit 95210bc806
5 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
progs/demos/gltestperf.c
View file

@ -164,7 +164,7 @@ init_test04(void)
glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
if ((gluerr = gluBuild2DMipmaps(GL_TEXTURE_2D, 3, 128, 128, GL_RGB, if ((gluerr = gluBuild2DMipmaps(GL_TEXTURE_2D, 3, 128, 128, GL_RGB,
GL_UNSIGNED_BYTE, (GLvoid *) (&tex[0])))) { GL_UNSIGNED_BYTE, (GLvoid *) (&tex[0])))) {
fprintf(stderr, "GLULib%s\n", gluErrorString(gluerr)); fprintf(stderr, "GLULib%s\n", (char *) gluErrorString(gluerr));
exit(-1); exit(-1);
} }
@ -239,7 +239,7 @@ init_test05(void)
glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
if ((gluerr = gluBuild2DMipmaps(GL_TEXTURE_2D, 3, 128, 128, GL_RGB, if ((gluerr = gluBuild2DMipmaps(GL_TEXTURE_2D, 3, 128, 128, GL_RGB,
GL_UNSIGNED_BYTE, (GLvoid *) (&tex[0])))) { GL_UNSIGNED_BYTE, (GLvoid *) (&tex[0])))) {
fprintf(stderr, "GLULib%s\n", gluErrorString(gluerr)); fprintf(stderr, "GLULib%s\n", (char *) gluErrorString(gluerr));
exit(-1); exit(-1);
} }

4
progs/demos/shadowtex.c
View file

@ -1,5 +1,3 @@
/* $Id: shadowtex.c,v 1.7 2002/07/12 15:54:02 brianp Exp $ */
/* /*
* Shadow demo using the GL_ARB_depth_texture, GL_ARB_shadow and * Shadow demo using the GL_ARB_depth_texture, GL_ARB_shadow and
* GL_ARB_shadow_ambient extensions (or the old SGIX extensions). * GL_ARB_shadow_ambient extensions (or the old SGIX extensions).
@ -362,7 +360,7 @@ Display(void)
error = glGetError(); error = glGetError();
if (error) { if (error) {
printf("GL Error: %s\n", gluErrorString(error)); printf("GL Error: %s\n", (char *) gluErrorString(error));
} }
} }

4
progs/demos/stex3d.c
View file

@ -1,5 +1,3 @@
/* $Id: stex3d.c,v 1.9 2003/03/31 16:51:38 brianp Exp $ */
/*----------------------------- /*-----------------------------
* stex3d.c GL example of the mesa 3d-texture extention to simulate procedural * stex3d.c GL example of the mesa 3d-texture extention to simulate procedural
* texturing, it uses a perlin noise and turbulence functions. * texturing, it uses a perlin noise and turbulence functions.
@ -535,7 +533,7 @@ KeyHandler(unsigned char key, int x, int y)
} }
void static void
create3Dgradient(void) create3Dgradient(void)
{ {
unsigned char *v; unsigned char *v;

7
progs/demos/texenv.c
View file

@ -169,7 +169,7 @@ struct baseFormatInfo baseFormats[] =
}; };
#define NUM_ENV_COLORS (sizeof(envColors) / sizeof(envColors[0])) #define NUM_ENV_COLORS (sizeof(envColors) / sizeof(envColors[0]))
int envColor; int envColor = 0;
GLfloat envColors[][4] = GLfloat envColors[][4] =
{ {
{ 0.0, 0.0, 0.0, 1.0 }, { 0.0, 0.0, 0.0, 1.0 },
@ -201,8 +201,6 @@ static void checkErrors( void )
{ {
GLenum error; GLenum error;
return;
while ( (error = glGetError()) != GL_NO_ERROR ) { while ( (error = glGetError()) != GL_NO_ERROR ) {
fprintf( stderr, "Error: %s\n", (char *) gluErrorString( error ) ); fprintf( stderr, "Error: %s\n", (char *) gluErrorString( error ) );
} }
@ -271,7 +269,8 @@ static void keyboard( unsigned char c, int x, int y )
{ {
switch ( c ) { switch ( c ) {
case 'c': case 'c':
envColor = (++envColor) % (int) NUM_ENV_COLORS; envColor++;
envColor = envColor % (int) NUM_ENV_COLORS;
break; break;
case 'g': case 'g':
drawBackground = !drawBackground; drawBackground = !drawBackground;

3
progs/demos/texobj.c
View file

@ -1,4 +1,4 @@
/* $Id: texobj.c,v 1.6 2002/01/04 21:05:57 brianp Exp $ */ /* $Id: texobj.c,v 1.7 2003/04/21 14:50:12 brianp Exp $ */
/* /*
* Example of using the 1.1 texture object functions. * Example of using the 1.1 texture object functions.
@ -9,6 +9,7 @@
#include <assert.h> #include <assert.h>
#include <math.h> #include <math.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "GL/glut.h" #include "GL/glut.h"