Mesa (master): i965simple: use u_reduced_prim() function

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Jun 19 09:48:43 2009 -0600

i965simple: use u_reduced_prim() function

---

 src/gallium/drivers/i965simple/brw_draw.c |   19 +++----------------
 1 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/gallium/drivers/i965simple/brw_draw.c b/src/gallium/drivers/i965simple/brw_draw.c
index 648aaa0..49d80cb 100644
--- a/src/gallium/drivers/i965simple/brw_draw.c
+++ b/src/gallium/drivers/i965simple/brw_draw.c
@@ -35,6 +35,7 @@
 
 #include "pipe/p_context.h"
 #include "pipe/internal/p_winsys_screen.h"
+#include "util/u_prim.h"
 
 static unsigned hw_prim[PIPE_PRIM_POLYGON+1] = {
    _3DPRIM_POINTLIST,
@@ -50,20 +51,6 @@ static unsigned hw_prim[PIPE_PRIM_POLYGON+1] = {
 };
 
 
-static const int reduced_prim[PIPE_PRIM_POLYGON+1] = {
-   PIPE_PRIM_POINTS,
-   PIPE_PRIM_LINES,
-   PIPE_PRIM_LINES,
-   PIPE_PRIM_LINES,
-   PIPE_PRIM_TRIANGLES,
-   PIPE_PRIM_TRIANGLES,
-   PIPE_PRIM_TRIANGLES,
-   PIPE_PRIM_TRIANGLES,
-   PIPE_PRIM_TRIANGLES,
-   PIPE_PRIM_TRIANGLES
-};
-
-
 /* When the primitive changes, set a state bit and re-validate.  Not
  * the nicest and would rather deal with this by having all the
  * programs be immune to the active primitive (ie. cope with all
@@ -85,8 +72,8 @@ static void brw_set_prim(struct brw_context *brw, int prim)
       brw->primitive = prim;
       brw->state.dirty.brw |= BRW_NEW_PRIMITIVE;
 
-      if (reduced_prim[prim] != brw->reduced_primitive) {
-	 brw->reduced_primitive = reduced_prim[prim];
+      if (u_reduced_prim(prim) != brw->reduced_primitive) {
+	 brw->reduced_primitive = u_reduced_prim(prim);
 	 brw->state.dirty.brw |= BRW_NEW_REDUCED_PRIMITIVE;
       }