diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-12-10 12:06:59 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-12-10 12:06:59 +1100 |
| commit | 5c1a5b504705214fd5e90b33bb3034e75f6b5994 (patch) | |
| tree | ac6e3bd4cb94979ad1fce57a3fd01249253ef3ae /progs/trivial/point-param.c | |
| parent | 1a3987240a547ba6e625c864f10a033858de4c65 (diff) | |
| parent | f8f9580a2a1c89af1dc0e169b62440053d9d7e81 (diff) | |
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Conflicts:
src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
src/mesa/pipe/Makefile
src/mesa/pipe/draw/draw_vertex_fetch.c
src/mesa/pipe/i915simple/i915_texture.c
src/mesa/pipe/softpipe/sp_texture.c
src/mesa/pipe/xlib/xm_winsys.c
src/mesa/state_tracker/st_cb_fbo.c
Diffstat (limited to 'progs/trivial/point-param.c')
| -rw-r--r-- | progs/trivial/point-param.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/progs/trivial/point-param.c b/progs/trivial/point-param.c index c50b7cb103..be4328d999 100644 --- a/progs/trivial/point-param.c +++ b/progs/trivial/point-param.c @@ -80,13 +80,13 @@ static void Draw(void) glBegin(GL_POINTS); glColor3f(1,0,0); - glVertex3f( 0.9, -0.9, -30.0); + glVertex3f( 0.9, -0.9, -10.0); glColor3f(1,1,0); - glVertex3f( 0.9, 0.9, -30.0); + glVertex3f( 0.9, 0.9, -5.0); glColor3f(1,0,1); glVertex3f(-0.9, 0.9, -30.0); glColor3f(0,1,1); - glVertex3f(-0.9, -0.9, -30.0); + glVertex3f(-0.9, -0.9, -20.0); glEnd(); glFlush(); |