mesa: Branch 'vbo-0.2' - 2 commits

[Roland Scheidegger]

 src/mesa/sources             |    3 +--
 src/mesa/vbo/vbo_exec_draw.c |    5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
diff-tree 327462d901cc1ff8e98bcbeba18ad54c77926390 (from 5970400476c5c0a1223a49e9ec2eb511ae94b246)
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Thu Jan 25 12:12:54 2007 +0100

    remove tnl/t_vtx_x86_gcc.S file from sources as it no longer exists

diff --git a/src/mesa/sources b/src/mesa/sources
index a32ecaf..fd6e8b4 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -243,8 +243,7 @@ X86_SOURCES =			\
 	x86/sse_xform3.S	\
 	x86/sse_xform4.S	\
 	x86/sse_normal.S	\
-	x86/read_rgba_span_x86.S \
-	tnl/t_vtx_x86_gcc.S
+	x86/read_rgba_span_x86.S
 
 X86_API =			\
 	x86/glapi_x86.S
diff-tree 5970400476c5c0a1223a49e9ec2eb511ae94b246 (from feeed10dfd1495eb15924868fec3b795fb4b1ba3)
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Thu Jan 25 12:11:03 2007 +0100

    re-fix bug 9062 in vbo code

diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c
index 846d5dc..2b52d7a 100644
--- a/src/mesa/vbo/vbo_exec_draw.c
+++ b/src/mesa/vbo/vbo_exec_draw.c
@@ -114,6 +114,11 @@ static GLuint vbo_copy_vertices( struct 
 	 return 2;
       }
    case GL_TRIANGLE_STRIP:
+      /* no parity issue, but need to make sure the tri is not drawn twice */
+      if (nr & 1) {
+	 exec->vtx.prim[exec->vtx.prim_count-1].count--;
+      }
+      /* fallthrough */
    case GL_QUAD_STRIP:
       switch (nr) {
       case 0: ovf = 0; break;