Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

	src/gallium/auxiliary/util/u_math.c

3 files changed, 5 insertions, 3 deletions

diff --git a/src/gallium/auxiliary/util/p_debug.c b/src/gallium/auxiliary/util/p_debug.c
index a1a51d7ef2a..0d019808b09 100644
--- a/src/gallium/auxiliary/util/p_debug.c
+++ b/src/gallium/auxiliary/util/p_debug.c
@@ -136,8 +136,10 @@ void _debug_vprintf(const char *format, va_list ap)
 #elif defined(PIPE_SUBSYSTEM_WINDOWS_MINIPORT)
    /* TODO */
 #else /* !PIPE_SUBSYSTEM_WINDOWS */
+#ifdef DEBUG
    vfprintf(stderr, format, ap);
 #endif
+#endif
 }
 
 
diff --git a/src/gallium/auxiliary/util/u_math.c b/src/gallium/auxiliary/util/u_math.c
index 5b3cab4642a..9c5f616ceb3 100644
--- a/src/gallium/auxiliary/util/u_math.c
+++ b/src/gallium/auxiliary/util/u_math.c
@@ -30,7 +30,7 @@
 #include "util/u_math.h"
 
 
-/** 2^x, for x in [-1.0, 1.0[ */
+/** 2^x, for x in [-1.0, 1.0] */
 float pow2_table[POW2_TABLE_SIZE];
 
 
@@ -43,7 +43,7 @@ init_pow2_table(void)
 }
 
 
-/** log2(x), for x in [1.0, 2.0[ */
+/** log2(x), for x in [1.0, 2.0] */
 float log2_table[LOG2_TABLE_SIZE];
 
 
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 7cf06da43cc..4bc734bad38 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -672,7 +672,7 @@ st_draw_vbo(GLcontext *ctx,
       pipe_buffer_reference(pipe->screen, &vbuffer[attr].buffer, NULL);
       assert(!vbuffer[attr].buffer);
    }
-   pipe->set_vertex_buffers(pipe, vp->num_inputs, vbuffer);
+   pipe->set_vertex_buffers(pipe, num_vbuffers, vbuffer);
 }