diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2009-12-15 12:38:01 -0800 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-12-15 12:38:01 -0800 |
commit | 11522b74b318db9d099466ff226124c23595e8e2 (patch) | |
tree | 2f57b1d594a9f6c223b002f1c549ea5f799b37cc /progs/trivial/tri-blend.c | |
parent | b90f7f3ad324b1e4c39e334cdeb9556c3eb808ab (diff) | |
parent | f23d01e726a57cd6b8e31f1049ee5853773df7ea (diff) |
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
src/gallium/drivers/softpipe/sp_quad_blend.c
Diffstat (limited to 'progs/trivial/tri-blend.c')
-rw-r--r-- | progs/trivial/tri-blend.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/progs/trivial/tri-blend.c b/progs/trivial/tri-blend.c index 58c451c976..f41be89b09 100644 --- a/progs/trivial/tri-blend.c +++ b/progs/trivial/tri-blend.c @@ -81,7 +81,7 @@ static void drawRightTriangle(void) glDisable (GL_BLEND); } -void display(void) +static void display(void) { glClear(GL_COLOR_BUFFER_BIT); @@ -97,7 +97,7 @@ void display(void) glFlush(); } -void reshape(int w, int h) +static void reshape(int w, int h) { glViewport(0, 0, (GLsizei) w, (GLsizei) h); glMatrixMode(GL_PROJECTION); @@ -109,7 +109,7 @@ void reshape(int w, int h) } /* ARGSUSED1 */ -void keyboard(unsigned char key, int x, int y) +static void keyboard(unsigned char key, int x, int y) { switch (key) { case 't': |