Merge branch 'mesa_7_5_branch'

[mesa.git] / src / gallium / drivers / cell / spu / spu_vertex_fetch.c

diff --git a/src/gallium/drivers/cell/spu/spu_vertex_fetch.c b/src/gallium/drivers/cell/spu/spu_vertex_fetch.c
index f7e4e653e3183eb1e65ce6f67e5ab04adab59e35..03375d84a57256e835dbee420cbf970907c6c6a9 100644 (file)
--- a/src/gallium/drivers/cell/spu/spu_vertex_fetch.c
+++ b/src/gallium/drivers/cell/spu/spu_vertex_fetch.c
@@ -32,9 +32,6 @@
   *   Ian Romanick <idr@us.ibm.com>
   */
 
-#include <spu_mfcio.h>
-
-#include "pipe/p_util.h"
 #include "pipe/p_state.h"
 #include "pipe/p_shader_tokens.h"
 #include "spu_exec.h"
@@ -95,7 +92,7 @@ static void generic_vertex_fetch(struct spu_vs_context *draw,
    unsigned nr_attrs = draw->vertex_fetch.nr_attrs;
    unsigned attr;
 
-   assert(count <= 4);
+   ASSERT(count <= 4);
 
 #if DRAW_DBG
    printf("SPU: %s count = %u, nr_attrs = %u\n",