Mesa (master): nouveau: Fix warning for void function returning value. Add missing include for pipe_reference_init function.

[Patrice Mandin]

Module: Mesa
Branch: master
Commit: e423df0f0c3e5a5d33d301b6176e9380e61b98ad
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e423df0f0c3e5a5d33d301b6176e9380e61b98ad

Author: Patrice Mandin <patman...@gmail.com>
Date:   Fri Feb  5 19:42:33 2010 +0100

nouveau: Fix warning for void function returning value. Add missing include for 
pipe_reference_init function.

Signed-off-by: Patrice Mandin <patman...@gmail.com>

---

 src/gallium/drivers/nv30/nv30_vbo.c                |    7 +++----
 src/gallium/drivers/nv40/nv40_vbo.c                |    4 ++--
 .../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 d50055f..a83ddf1 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 d1c76c0..1e14edc 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 3f41e5d..8e5f821 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"
 

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit