diff options
| author | Brian Paul <[email protected]> | 2009-12-21 18:23:53 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-12-21 18:23:53 -0700 |
| commit | b57abd3bea29e95e5dee2524c3f1be4b26017c0f (patch) | |
| tree | 8da85ef6e5ef40a4a7bd328fc574a27c2b8c0849 /progs/trivial/vbo-noninterleaved.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/trivial/vbo-noninterleaved.c')
| -rw-r--r-- | progs/trivial/vbo-noninterleaved.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/progs/trivial/vbo-noninterleaved.c b/progs/trivial/vbo-noninterleaved.c index 0672ca50ff1..f7c42a89818 100644 --- a/progs/trivial/vbo-noninterleaved.c +++ b/progs/trivial/vbo-noninterleaved.c @@ -87,8 +87,8 @@ static void Display( void ) glEnable(GL_VERTEX_PROGRAM_ARB); -// glDrawArrays( GL_TRIANGLES, 0, 3 ); -// glDrawArrays( GL_TRIANGLES, 1, 3 ); + /* glDrawArrays( GL_TRIANGLES, 0, 3 ); */ + /* glDrawArrays( GL_TRIANGLES, 1, 3 ); */ glDrawArrays( GL_QUADS, 0, 4 ); glFlush(); |