diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2008-10-10 15:19:05 +0100 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-10-10 15:23:36 +0100 |
| commit | d7f1cb5b5a134b63227d5746a2dd1f05597c5c2f (patch) | |
| tree | 7446e243da8b50f6cb323b7917bdb94fbd528368 /src/mesa/state_tracker/st_draw.c | |
| parent | 7ac1fc77661faf0897507fef0437fe69d0ba53ac (diff) | |
| parent | f7556fdd40ed2719beaba271eee4a7551e212ad1 (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
src/gallium/auxiliary/gallivm/instructionssoa.cpp
src/gallium/auxiliary/gallivm/soabuiltins.c
src/gallium/auxiliary/rtasm/rtasm_x86sse.c
src/gallium/auxiliary/rtasm/rtasm_x86sse.h
src/mesa/main/texenvprogram.c
src/mesa/shader/arbprogparse.c
src/mesa/shader/prog_statevars.c
src/mesa/state_tracker/st_draw.c
src/mesa/vbo/vbo_exec_draw.c
Diffstat (limited to 'src/mesa/state_tracker/st_draw.c')
| -rw-r--r-- | src/mesa/state_tracker/st_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c index f9016923dc..61949a9388 100644 --- a/src/mesa/state_tracker/st_draw.c +++ b/src/mesa/state_tracker/st_draw.c @@ -526,7 +526,7 @@ st_draw_vbo(GLcontext *ctx, num_vbuffers = 1; num_velements = vp->num_inputs; if (num_velements == 0) - num_vbuffers = 0; + num_vbuffers = 0; } else { /*printf("Draw non-interleaved\n");*/ |