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

Author: Zack Rusin <[email protected]>
Date:   Thu Apr 18 03:03:14 2013 -0700

util/prim: fix decomposed counts for adjacency primitives

Signed-off-by: Zack Rusin <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Jose Fonseca <[email protected]>

---

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

diff --git a/src/gallium/auxiliary/util/u_prim.h 
b/src/gallium/auxiliary/util/u_prim.h
index 99bb66c..507d12e 100644
--- a/src/gallium/auxiliary/util/u_prim.h
+++ b/src/gallium/auxiliary/util/u_prim.h
@@ -190,13 +190,13 @@ u_decomposed_prims_for_vertices(int primitive, int 
vertices)
    case PIPE_PRIM_TRIANGLE_FAN:
       return (vertices > 2) ? vertices - 2 : 0;
    case PIPE_PRIM_LINES_ADJACENCY:
-      return vertices / 2;
+      return vertices / 4;
    case PIPE_PRIM_LINE_STRIP_ADJACENCY:
-      return (vertices > 1) ? vertices - 1 : 0;
+      return (vertices > 3) ? vertices - 3 : 0;
    case PIPE_PRIM_TRIANGLES_ADJACENCY:
-      return vertices / 3;
+      return vertices / 6;
    case PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY:
-      return (vertices > 2) ? vertices - 2 : 0;
+      return (vertices > 5) ? 1 + (vertices - 6)/2 : 0;
    case PIPE_PRIM_QUADS:
       return vertices / 4;
    case PIPE_PRIM_QUAD_STRIP:

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to