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/glsl/shtest.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/glsl/shtest.c')
| -rw-r--r-- | progs/glsl/shtest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/progs/glsl/shtest.c b/progs/glsl/shtest.c index 9d76e018e3..88315d7461 100644 --- a/progs/glsl/shtest.c +++ b/progs/glsl/shtest.c @@ -627,7 +627,7 @@ Init(void) NumAttribs = GetAttribs(Program, Attribs); PrintAttribs(Attribs); - /*assert(glGetError() == 0);*/ + /* assert(glGetError() == 0); */ glClearColor(0.4f, 0.4f, 0.8f, 0.0f); |