diff options
| author | Brian Paul <brianp@vmware.com> | 2009-12-21 18:23:53 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-12-21 18:23:53 -0700 |
| commit | b57abd3bea29e95e5dee2524c3f1be4b26017c0f (patch) | |
| tree | 8da85ef6e5ef40a4a7bd328fc574a27c2b8c0849 /progs/redbook/texturesurf.c | |
| parent | bf064ce0c31abb036fc035c59fdc1134705a5e3f (diff) | |
| parent | e46ad402f1fecf0fc8d2538eb5abbdde97484799 (diff) | |
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
configure.ac
progs/demos/morph3d.c
progs/demos/textures.c
progs/glsl/shtest.c
progs/glsl/texaaline.c
progs/tests/packedpixels.c
progs/xdemos/corender.c
src/mesa/main/version.h
Diffstat (limited to 'progs/redbook/texturesurf.c')
| -rw-r--r-- | progs/redbook/texturesurf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/progs/redbook/texturesurf.c b/progs/redbook/texturesurf.c index 0170070eaa..2023072dba 100644 --- a/progs/redbook/texturesurf.c +++ b/progs/redbook/texturesurf.c @@ -60,7 +60,7 @@ GLfloat ctrlpoints[4][4][3] = { GLfloat texpts[2][2][2] = {{{0.0, 0.0}, {0.0, 1.0}}, {{1.0, 0.0}, {1.0, 1.0}}}; -void display(void) +static void display(void) { glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glColor3f(1.0, 1.0, 1.0); @@ -72,7 +72,7 @@ void display(void) #define imageHeight 64 GLubyte image[3*imageWidth*imageHeight]; -void makeImage(void) +static void makeImage(void) { int i, j; float ti, tj; @@ -89,7 +89,7 @@ void makeImage(void) } } -void myinit(void) +static void myinit(void) { glMap2f(GL_MAP2_VERTEX_3, 0, 1, 3, 4, 0, 1, 12, 4, &ctrlpoints[0][0][0]); @@ -112,7 +112,7 @@ void myinit(void) glShadeModel (GL_FLAT); } -void myReshape(int w, int h) +static void myReshape(int w, int h) { glViewport(0, 0, w, h); glMatrixMode(GL_PROJECTION); |