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/xdemos | |
| 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/xdemos')
| -rw-r--r-- | progs/xdemos/corender.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/progs/xdemos/corender.c b/progs/xdemos/corender.c index 8c70535482..640c902c13 100644 --- a/progs/xdemos/corender.c +++ b/progs/xdemos/corender.c @@ -187,7 +187,7 @@ redraw(Display *dpy) * Without this glClear(), depth buffer for the second process * is pretty much broken. */ - /*glClear(GL_DEPTH_BUFFER_BIT);*/ + /* glClear(GL_DEPTH_BUFFER_BIT); */ glPushMatrix(); glTranslatef(1, 0, 0); |