diff options
| author | Patrice Mandin <[email protected]> | 2010-02-05 19:42:33 +0100 |
|---|---|---|
| committer | Patrice Mandin <[email protected]> | 2010-02-05 19:42:33 +0100 |
| commit | e423df0f0c3e5a5d33d301b6176e9380e61b98ad (patch) | |
| tree | 6eae3c148bc1afcb2a5951e6212544f041f16014 /src/gallium | |
| parent | da73c4d5fef6ad20d41de9a4e2d1d86b0b83fd8b (diff) | |
nouveau: Fix warning for void function returning value. Add missing include for pipe_reference_init function.
Signed-off-by: Patrice Mandin <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/nv30/nv30_vbo.c | 7 | ||||
| -rw-r--r-- | src/gallium/drivers/nv40/nv40_vbo.c | 4 | ||||
| -rw-r--r-- | src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c | 1 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/drivers/nv30/nv30_vbo.c b/src/gallium/drivers/nv30/nv30_vbo.c index d50055fdd33..a83ddf11546 100644 --- a/src/gallium/drivers/nv30/nv30_vbo.c +++ b/src/gallium/drivers/nv30/nv30_vbo.c @@ -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) { diff --git a/src/gallium/drivers/nv40/nv40_vbo.c b/src/gallium/drivers/nv40/nv40_vbo.c index d1c76c03cdd..1e14edc56a7 100644 --- a/src/gallium/drivers/nv40/nv40_vbo.c +++ b/src/gallium/drivers/nv40/nv40_vbo.c @@ -382,7 +382,7 @@ nv40_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 +424,7 @@ nv40_draw_elements_vbo(struct pipe_context *pipe, FIRE_RING(chan); continue; } - + BEGIN_RING(chan, curie, NV40TCL_BEGIN_END, 1); OUT_RING (chan, nvgl_primitive(mode)); diff --git a/src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c b/src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c index 3f41e5d0ceb..8e5f821c8a3 100644 --- a/src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c +++ b/src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c @@ -2,6 +2,7 @@ #include "pipe/p_state.h" #include "util/u_format.h" #include "util/u_memory.h" +#include "util/u_inlines.h" #include "nouveau_drm_api.h" |