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

progs/samples: 'Silence no previous prototype' warnings.

Browse source
This commit is contained in:
Vinson Lee 2010-01-01 17:54:11 -08:00
parent 2c64e4c50e
commit 646c8ce032
7 changed files with 58 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
progs/samples/olympic.c
View file

@ -74,7 +74,7 @@ int iters[RINGS];
GLuint theTorus; GLuint theTorus;
void FillTorus(float rc, int numc, float rt, int numt) static void FillTorus(float rc, int numc, float rt, int numt)
{ {
int i, j, k; int i, j, k;
double s, t; double s, t;
@ -106,7 +106,7 @@ void FillTorus(float rc, int numc, float rt, int numt)
} }
} }
float Clamp(int iters_left, float t) static float Clamp(int iters_left, float t)
{ {
if (iters_left < 3) { if (iters_left < 3) {
return 0.0; return 0.0;
@ -114,7 +114,7 @@ float Clamp(int iters_left, float t)
return (iters_left-2)*t/iters_left; return (iters_left-2)*t/iters_left;
} }
void DrawScene(void) static void DrawScene(void)
{ {
int i, j; int i, j;
GLboolean goIdle; GLboolean goIdle;
@ -172,7 +172,7 @@ void DrawScene(void)
} }
} }
float MyRand(void) static float MyRand(void)
{ {
return 10.0 * ( (float) rand() / (float) RAND_MAX - 0.5 ); return 10.0 * ( (float) rand() / (float) RAND_MAX - 0.5 );
} }
@ -181,12 +181,12 @@ float MyRand(void)
#define GLUTCALLBACK #define GLUTCALLBACK
#endif #endif
void GLUTCALLBACK glut_post_redisplay_p(void) static void GLUTCALLBACK glut_post_redisplay_p(void)
{ {
glutPostRedisplay(); glutPostRedisplay();
} }
void ReInit(void) static void ReInit(void)
{ {
int i; int i;
float deviation; float deviation;
@ -206,7 +206,7 @@ void ReInit(void)
glutIdleFunc(glut_post_redisplay_p); glutIdleFunc(glut_post_redisplay_p);
} }
void Init(void) static void Init(void)
{ {
float base, height; float base, height;
float aspect, x, y; float aspect, x, y;
@ -312,13 +312,13 @@ void Init(void)
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
} }
void Reshape(int width, int height) static void Reshape(int width, int height)
{ {
glViewport(0, 0, width, height); glViewport(0, 0, width, height);
} }
void Key(unsigned char key, int x, int y) static void Key(unsigned char key, int x, int y)
{ {
switch (key) { switch (key) {
@ -330,7 +330,7 @@ void Key(unsigned char key, int x, int y)
} }
} }
GLenum Args(int argc, char **argv) static GLenum Args(int argc, char **argv)
{ {
GLint i; GLint i;

18
progs/samples/overlay.c
View file

@ -69,19 +69,19 @@ starRec stars[MAXSTARS];
float sinTable[MAXANGLES]; float sinTable[MAXANGLES];
float Sin(float angle) static float Sin(float angle)
{ {
return (sinTable[(GLint)angle]); return (sinTable[(GLint)angle]);
} }
float Cos(float angle) static float Cos(float angle)
{ {
return (sinTable[((GLint)angle+(MAXANGLES/4))%MAXANGLES]); return (sinTable[((GLint)angle+(MAXANGLES/4))%MAXANGLES]);
} }
void NewStar(GLint n, GLint d) static void NewStar(GLint n, GLint d)
{ {
if (rand()%4 == 0) { if (rand()%4 == 0) {
@ -103,7 +103,7 @@ void NewStar(GLint n, GLint d)
} }
} }
void RotatePoint(float *x, float *y, float rotation) static void RotatePoint(float *x, float *y, float rotation)
{ {
float tmpX, tmpY; float tmpX, tmpY;
@ -113,7 +113,7 @@ void RotatePoint(float *x, float *y, float rotation)
*y = tmpY; *y = tmpY;
} }
void MoveStars(void) static void MoveStars(void)
{ {
float offset; float offset;
GLint n; GLint n;
@ -134,7 +134,7 @@ void MoveStars(void)
} }
} }
GLenum StarPoint(GLint n) static GLenum StarPoint(GLint n)
{ {
float x0, y0, x1, y1, width; float x0, y0, x1, y1, width;
GLint i; GLint i;
@ -182,7 +182,7 @@ GLenum StarPoint(GLint n)
} }
} }
void ShowStars(void) static void ShowStars(void)
{ {
GLint n; GLint n;
@ -221,7 +221,7 @@ static void Init(void)
glDisable(GL_DITHER); glDisable(GL_DITHER);
} }
void Reshape(int width, int height) static void Reshape(int width, int height)
{ {
windW = (GLint)width; windW = (GLint)width;
@ -262,7 +262,7 @@ static void Key(unsigned char key, int x, int y)
} }
} }
void Idle(void) static void Idle(void)
{ {
if (overlayInit == GL_FALSE) { if (overlayInit == GL_FALSE) {

6
progs/samples/rgbtoppm.c
View file

@ -25,7 +25,7 @@ typedef struct _ImageRec {
int *rowSize; int *rowSize;
} ImageRec; } ImageRec;
void static void
rgbtorgb(unsigned char *r,unsigned char *g,unsigned char *b,unsigned char *l,int n) { rgbtorgb(unsigned char *r,unsigned char *g,unsigned char *b,unsigned char *l,int n) {
while(n--) { while(n--) {
l[0] = r[0]; l[0] = r[0];
@ -170,7 +170,7 @@ ImageGetRow(ImageRec *image, unsigned char *buf, int y, int z) {
} }
} }
GLubyte * static GLubyte *
read_alpha_texture(char *name, int *width, int *height) read_alpha_texture(char *name, int *width, int *height)
{ {
unsigned char *base, *lptr; unsigned char *base, *lptr;
@ -200,7 +200,7 @@ read_alpha_texture(char *name, int *width, int *height)
return (unsigned char *) base; return (unsigned char *) base;
} }
GLubyte * static GLubyte *
read_rgb_texture(char *name, int *width, int *height) read_rgb_texture(char *name, int *width, int *height)
{ {
unsigned char *base, *ptr; unsigned char *base, *ptr;

30
progs/samples/sphere.c
View file

@ -445,7 +445,7 @@ GLfloat identity[16] = {
}; };
void BuildCylinder(int numEdges) static void BuildCylinder(int numEdges)
{ {
int i, top = 1.0, bottom = -1.0; int i, top = 1.0, bottom = -1.0;
float x[100], y[100], angle; float x[100], y[100], angle;
@ -481,7 +481,7 @@ void BuildCylinder(int numEdges)
glEndList(); glEndList();
} }
void BuildTorus(float rc, int numc, float rt, int numt) static void BuildTorus(float rc, int numc, float rt, int numt)
{ {
int i, j, k; int i, j, k;
double s, t; double s, t;
@ -515,7 +515,7 @@ void BuildTorus(float rc, int numc, float rt, int numt)
glEndList(); glEndList();
} }
void BuildCage(void) static void BuildCage(void)
{ {
int i; int i;
float inc; float inc;
@ -609,7 +609,7 @@ void BuildCage(void)
glEndList(); glEndList();
} }
void BuildCube(void) static void BuildCube(void)
{ {
int i, j; int i, j;
@ -628,7 +628,7 @@ void BuildCube(void)
glEndList(); glEndList();
} }
void BuildLists(void) static void BuildLists(void)
{ {
cube = glGenLists(1); cube = glGenLists(1);
@ -646,7 +646,7 @@ void BuildLists(void)
genericObject = torus; genericObject = torus;
} }
void SetDefaultSettings(void) static void SetDefaultSettings(void)
{ {
magFilter = nnearest; magFilter = nnearest;
@ -657,7 +657,7 @@ void SetDefaultSettings(void)
autoRotate = GL_TRUE; autoRotate = GL_TRUE;
} }
unsigned char *AlphaPadImage(int bufSize, unsigned char *inData, int alpha) static unsigned char *AlphaPadImage(int bufSize, unsigned char *inData, int alpha)
{ {
unsigned char *outData, *out_ptr, *in_ptr; unsigned char *outData, *out_ptr, *in_ptr;
int i; int i;
@ -677,7 +677,7 @@ unsigned char *AlphaPadImage(int bufSize, unsigned char *inData, int alpha)
return outData; return outData;
} }
void Init(void) static void Init(void)
{ {
float ambient[] = {0.0, 0.0, 0.0, 1.0}; float ambient[] = {0.0, 0.0, 0.0, 1.0};
float diffuse[] = {1.0, 1.0, 1.0, 1.0}; float diffuse[] = {1.0, 1.0, 1.0, 1.0};
@ -753,7 +753,7 @@ void Init(void)
BuildLists(); BuildLists();
} }
void ReInit(void) static void ReInit(void)
{ {
if (genericObject == torus) { if (genericObject == torus) {
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
@ -773,7 +773,7 @@ void ReInit(void)
glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, textureEnvironment); glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, textureEnvironment);
} }
void Draw(void) static void Draw(void)
{ {
glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
@ -806,7 +806,7 @@ void Draw(void)
glutSwapBuffers(); glutSwapBuffers();
} }
void Reshape(int width, int height) static void Reshape(int width, int height)
{ {
W = width; W = width;
H = height; H = height;
@ -818,7 +818,7 @@ void Reshape(int width, int height)
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
} }
void Idle(void) static void Idle(void)
{ {
static double t0 = -1.; static double t0 = -1.;
double t, dt; double t, dt;
@ -833,7 +833,7 @@ void Idle(void)
glutPostRedisplay(); glutPostRedisplay();
} }
void Key2(int key, int x, int y) static void Key2(int key, int x, int y)
{ {
switch (key) { switch (key) {
@ -863,7 +863,7 @@ void Key2(int key, int x, int y)
glutPostRedisplay(); glutPostRedisplay();
} }
void Key(unsigned char key, int x, int y) static void Key(unsigned char key, int x, int y)
{ {
switch (key) { switch (key) {
@ -950,7 +950,7 @@ void Key(unsigned char key, int x, int y)
glutPostRedisplay(); glutPostRedisplay();
} }
GLenum Args(int argc, char **argv) static GLenum Args(int argc, char **argv)
{ {
GLint i; GLint i;

20
progs/samples/star.c
View file

@ -67,19 +67,19 @@ starRec stars[MAXSTARS];
float sinTable[MAXANGLES]; float sinTable[MAXANGLES];
float Sin(float angle) static float Sin(float angle)
{ {
return (sinTable[(GLint)angle]); return (sinTable[(GLint)angle]);
} }
float Cos(float angle) static float Cos(float angle)
{ {
return (sinTable[((GLint)angle+(MAXANGLES/4))%MAXANGLES]); return (sinTable[((GLint)angle+(MAXANGLES/4))%MAXANGLES]);
} }
void NewStar(GLint n, GLint d) static void NewStar(GLint n, GLint d)
{ {
if (rand()%4 == 0) { if (rand()%4 == 0) {
@ -101,7 +101,7 @@ void NewStar(GLint n, GLint d)
} }
} }
void RotatePoint(float *x, float *y, float rotation) static void RotatePoint(float *x, float *y, float rotation)
{ {
float tmpX, tmpY; float tmpX, tmpY;
@ -111,7 +111,7 @@ void RotatePoint(float *x, float *y, float rotation)
*y = tmpY; *y = tmpY;
} }
void MoveStars(void) static void MoveStars(void)
{ {
float offset; float offset;
GLint n; GLint n;
@ -142,7 +142,7 @@ void MoveStars(void)
} }
} }
GLenum StarPoint(GLint n) static GLenum StarPoint(GLint n)
{ {
float x0, y0, x1, y1, width; float x0, y0, x1, y1, width;
GLint i; GLint i;
@ -190,7 +190,7 @@ GLenum StarPoint(GLint n)
} }
} }
void ShowStars(void) static void ShowStars(void)
{ {
GLint n; GLint n;
@ -229,7 +229,7 @@ static void Init(void)
glDisable(GL_DITHER); glDisable(GL_DITHER);
} }
void Reshape(int width, int height) static void Reshape(int width, int height)
{ {
windW = (GLint)width; windW = (GLint)width;
@ -260,7 +260,7 @@ static void Key(unsigned char key, int x, int y)
} }
} }
void Draw(void) static void Draw(void)
{ {
MoveStars(); MoveStars();
@ -307,7 +307,7 @@ static GLenum Args(int argc, char **argv)
#define GLUTCALLBACK #define GLUTCALLBACK
#endif #endif
void GLUTCALLBACK glut_post_redisplay_p(void) static void GLUTCALLBACK glut_post_redisplay_p(void)
{ {
glutPostRedisplay(); glutPostRedisplay();
} }

20
progs/samples/stretch.c
View file

@ -67,7 +67,7 @@ int cCount, cIndex[2], cStep;
GLenum op = OP_NOOP; GLenum op = OP_NOOP;
void DrawImage(void) static void DrawImage(void)
{ {
glRasterPos2i(0, 0); glRasterPos2i(0, 0);
@ -84,7 +84,7 @@ void DrawImage(void)
image->data); image->data);
} }
void DrawPoint(void) static void DrawPoint(void)
{ {
int i; int i;
@ -102,7 +102,7 @@ void DrawPoint(void)
} }
} }
void InitVList(void) static void InitVList(void)
{ {
vList[0].x = 0.0; vList[0].x = 0.0;
@ -141,7 +141,7 @@ void InitVList(void)
vList[4].tY = cList[0].y / (float)imageSizeY; vList[4].tY = cList[0].y / (float)imageSizeY;
} }
void ScaleImage(int sizeX, int sizeY) static void ScaleImage(int sizeX, int sizeY)
{ {
GLubyte *buf; GLubyte *buf;
@ -154,7 +154,7 @@ void ScaleImage(int sizeX, int sizeY)
image->sizeY = sizeY; image->sizeY = sizeY;
} }
void SetPoint(int x, int y) static void SetPoint(int x, int y)
{ {
cList[cCount].x = (float)x; cList[cCount].x = (float)x;
@ -162,7 +162,7 @@ void SetPoint(int x, int y)
cCount++; cCount++;
} }
void Stretch(void) static void Stretch(void)
{ {
glBegin(GL_TRIANGLES); glBegin(GL_TRIANGLES);
@ -221,7 +221,7 @@ void Stretch(void)
} }
} }
void Key(unsigned char key, int x, int y) static void Key(unsigned char key, int x, int y)
{ {
switch (key) { switch (key) {
@ -245,7 +245,7 @@ void Key(unsigned char key, int x, int y)
glutPostRedisplay(); glutPostRedisplay();
} }
void Mouse(int button, int state, int mouseX, int mouseY) static void Mouse(int button, int state, int mouseX, int mouseY)
{ {
if (state != GLUT_DOWN) if (state != GLUT_DOWN)
@ -263,7 +263,7 @@ void Mouse(int button, int state, int mouseX, int mouseY)
glutPostRedisplay(); glutPostRedisplay();
} }
void Animate(void) static void Animate(void)
{ {
static double t0 = -1.; static double t0 = -1.;
double t, dt; double t, dt;
@ -322,7 +322,7 @@ static GLenum Args(int argc, char **argv)
#define GLUTCALLBACK #define GLUTCALLBACK
#endif #endif
void GLUTCALLBACK glut_post_redisplay_p(void) static void GLUTCALLBACK glut_post_redisplay_p(void)
{ {
glutPostRedisplay(); glutPostRedisplay();
} }

2
progs/samples/wave.c
View file

@ -92,7 +92,7 @@ GLubyte contourTexture2[] = {
#endif #endif
void GLUTCALLBACK glut_post_redisplay_p(void) static void GLUTCALLBACK glut_post_redisplay_p(void)
{ {
static double t0 = -1.; static double t0 = -1.;
double t, dt; double t, dt;