diff options
Diffstat (limited to 'src/gallium/drivers/nv30/nv30_vbo.c')
| -rw-r--r-- | src/gallium/drivers/nv30/nv30_vbo.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gallium/drivers/nv30/nv30_vbo.c b/src/gallium/drivers/nv30/nv30_vbo.c index 1c5db03ea2..a83ddf1154 100644 --- a/src/gallium/drivers/nv30/nv30_vbo.c +++ b/src/gallium/drivers/nv30/nv30_vbo.c @@ -1,6 +1,6 @@ #include "pipe/p_context.h" #include "pipe/p_state.h" -#include "pipe/p_inlines.h" +#include "util/u_inlines.h" #include "nv30_context.h" #include "nv30_state.h" @@ -223,7 +223,6 @@ nv30_draw_arrays(struct pipe_context *pipe, } pipe->flush(pipe, 0, NULL); - return TRUE; } static INLINE void @@ -382,7 +381,7 @@ nv30_draw_elements_inline(struct pipe_context *pipe, map = pipe_buffer_map(pscreen, ib, PIPE_BUFFER_USAGE_CPU_READ); if (!ib) { NOUVEAU_ERR("failed mapping ib\n"); - return FALSE; + return; } switch (ib_size) { @@ -424,7 +423,7 @@ nv30_draw_elements_vbo(struct pipe_context *pipe, FIRE_RING(chan); continue; } - + BEGIN_RING(chan, rankine, NV34TCL_VERTEX_BEGIN_END, 1); OUT_RING (chan, nvgl_primitive(mode)); @@ -468,7 +467,7 @@ nv30_draw_elements(struct pipe_context *pipe, if (FORCE_SWTNL || !nv30_state_validate(nv30)) { /*return nv30_draw_elements_swtnl(pipe, NULL, 0, mode, start, count);*/ - return; + return; } if (idxbuf) { |