Mesa (master): util/prim: fix primitive trimming for triangles with adjacency

[Chia-I Wu]

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

Author: Chia-I Wu <olvaffe at gmail.com>
Date:   Thu May  2 11:25:39 2013 +0800

util/prim: fix primitive trimming for triangles with adjacency

Fix for PIPE_PRIM_TRIANGLES_ADJACENCY and PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY.

Signed-off-by: Chia-I Wu <olvaffe at gmail.com>
Acked-by: Zack Rusin <zackr at vmware.com>

---

 src/gallium/auxiliary/util/u_prim.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_prim.h b/src/gallium/auxiliary/util/u_prim.h
index e477444..31f9235 100644
--- a/src/gallium/auxiliary/util/u_prim.h
+++ b/src/gallium/auxiliary/util/u_prim.h
@@ -91,8 +91,8 @@ static INLINE boolean u_trim_pipe_prim( unsigned pipe_prim, unsigned *nr )
       { 3, 0 }, /* PIPE_PRIM_TRIANGLE_POLYGON */
       { 4, 4 }, /* PIPE_PRIM_LINES_ADJACENCY */
       { 4, 0 }, /* PIPE_PRIM_LINE_STRIP_ADJACENCY */
-      { 6, 5 }, /* PIPE_PRIM_TRIANGLES_ADJACENCY */
-      { 4, 0 }, /* PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY */
+      { 6, 6 }, /* PIPE_PRIM_TRIANGLES_ADJACENCY */
+      { 6, 2 }, /* PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY */
    };
 
    if (unlikely(pipe_prim >= PIPE_PRIM_MAX)) {