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/tests/scissor.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/tests/scissor.c')
| -rw-r--r-- | progs/tests/scissor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/progs/tests/scissor.c b/progs/tests/scissor.c index 2dfd2174e8..e5a68ffabd 100644 --- a/progs/tests/scissor.c +++ b/progs/tests/scissor.c @@ -134,7 +134,7 @@ static void draw(void) glDisable(GL_SCISSOR_TEST); - //glutSwapBuffers(); + /* glutSwapBuffers(); */ glFlush(); } @@ -150,7 +150,7 @@ int main(int argc, char **argv) glutInitWindowPosition(100, 0); glutInitWindowSize(prog.width, prog.height); - //type = GLUT_RGB | GLUT_DOUBLE; + /* type = GLUT_RGB | GLUT_DOUBLE; */ type = GLUT_RGB | GLUT_SINGLE; glutInitDisplayMode(type); |