nouveau: fix build

diff --git a/src/gallium/drivers/nv30/nv30_draw.c b/src/gallium/drivers/nv30/nv30_draw.c
index 8ec0835225bcb10ec1ce0e7d729d79278efe2e46..aeeaf58f20a94ee9235e2cb79e1fdb8a3b5d3b1c 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_draw.c
+++ b/src/gallium/drivers/nv30/nv30_draw.c
@@ -1,4 +1,4 @@
-#include "draw/draw_private.h"
+#include "draw/draw_pipe.h"
 #include "pipe/p_util.h"
 
 #include "nv30_context.h"

diff --git a/src/gallium/drivers/nv40/nv40_draw.c b/src/gallium/drivers/nv40/nv40_draw.c
index dd5cc8fc998393686d24056ffe763a14e6855595..a9a939af0c02e4332f102169aabafc5b86bc871d 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_draw.c
+++ b/src/gallium/drivers/nv40/nv40_draw.c
@@ -3,7 +3,7 @@
 
 #include "draw/draw_context.h"
 #include "draw/draw_vertex.h"
-#include "draw/draw_private.h"
+#include "draw/draw_pipe.h"
 
 #include "nv40_context.h"
 #define NV40_SHADER_NO_FUCKEDNESS

diff --git a/src/gallium/drivers/nv50/nv50_draw.c b/src/gallium/drivers/nv50/nv50_draw.c
index 790408c6df8426d660b62b9afdd7c7c97f41ae70..d185d999502915d67deaf3a01b90183d30b77994 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_draw.c
+++ b/src/gallium/drivers/nv50/nv50_draw.c
@@ -1,4 +1,4 @@
-#include "draw/draw_private.h"
+#include "draw/draw_pipe.h"
 #include "pipe/p_util.h"
 
 #include "nv50_context.h"

diff --git a/src/gallium/drivers/nv50/nv50_state.c b/src/gallium/drivers/nv50/nv50_state.c
index a614ea033587bd63ca6ae168688f3cfd290f2d28..f42bae0c28da1c2353aa8c510845f5ebf87f9d4b 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_state.c
+++ b/src/gallium/drivers/nv50/nv50_state.c
@@ -113,7 +113,6 @@ nv50_rasterizer_state_create(struct pipe_context *pipe,
        struct nouveau_grobj *tesla = nv50_context(pipe)->screen->tesla;
        struct nv50_rasterizer_stateobj *rso =
                CALLOC_STRUCT(nv50_rasterizer_stateobj);
-       unsigned i;
 
        /*XXX: ignored
         *      - light_twosize