[pkgsrc/trunk]: pkgsrc/graphics/MesaLib That evil macro RENDER_SPAN is define...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/34d0a20adbe8
branches:  trunk
changeset: 507290:34d0a20adbe8
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Jan 30 08:54:55 2006 +0000

description:
That evil macro RENDER_SPAN is defined twice -- I only catched one in the
first try.

diffstat:

 graphics/MesaLib/distinfo         |   4 ++--
 graphics/MesaLib/patches/patch-ak |  24 +++++++++++++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diffs (54 lines):

diff -r 88f6b6e7715b -r 34d0a20adbe8 graphics/MesaLib/distinfo
--- a/graphics/MesaLib/distinfo Mon Jan 30 08:44:25 2006 +0000
+++ b/graphics/MesaLib/distinfo Mon Jan 30 08:54:55 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2006/01/26 15:16:16 rillig Exp $
+$NetBSD: distinfo,v 1.35 2006/01/30 08:54:55 rillig Exp $
 
 SHA1 (Mesa-6.4.1/MesaLib-6.4.1.tar.bz2) = efb70276ccd9cd13dbd7d5e581213a5ca3e4ef25
 RMD160 (Mesa-6.4.1/MesaLib-6.4.1.tar.bz2) = e3a54d6442fa5d6e446bb0b6704bd22c31fb4927
@@ -19,4 +19,4 @@
 SHA1 (patch-ah) = b9ee33c497b8abe2af004a4f13219a19f413f30e
 SHA1 (patch-ai) = 3c5e4cc1e054514111d50c1d01257f4647b14558
 SHA1 (patch-aj) = a805947e1aaf73a798fd3a8c6e39bf1bd62afc3a
-SHA1 (patch-ak) = 6c0d2d3b9a6b0c237b541c9c352584be5a7c66d1
+SHA1 (patch-ak) = 3cce21b97f828895e73aa75469ce75de4f84be83
diff -r 88f6b6e7715b -r 34d0a20adbe8 graphics/MesaLib/patches/patch-ak
--- a/graphics/MesaLib/patches/patch-ak Mon Jan 30 08:44:25 2006 +0000
+++ b/graphics/MesaLib/patches/patch-ak Mon Jan 30 08:54:55 2006 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ak,v 1.1 2006/01/26 15:16:16 rillig Exp $
+$NetBSD: patch-ak,v 1.2 2006/01/30 08:54:55 rillig Exp $
 
 Declarations inside of macros are evil. Even more if they are not preceded
 by an additional opening brace.
 
---- src/mesa/swrast/s_triangle.c.orig  2006-01-23 21:27:28.000000000 +0100
-+++ src/mesa/swrast/s_triangle.c       2006-01-23 21:27:06.000000000 +0100
+--- src/mesa/swrast/s_triangle.c.orig  2005-06-30 15:42:10.000000000 +0200
++++ src/mesa/swrast/s_triangle.c       2006-01-30 09:53:24.000000000 +0100
 @@ -163,6 +163,7 @@ _swrast_culltriangle( GLcontext *ctx,
     }
  
@@ -23,3 +23,21 @@
  
  #include "s_tritemp.h"
  
+@@ -214,6 +216,7 @@ _swrast_culltriangle( GLcontext *ctx,
+    }
+ 
+ #define RENDER_SPAN( span )                                           \
++{                                                                     \
+    GLuint i;                                                          \
+    span.intTex[0] -= FIXED_HALF; /* off-by-one error? */              \
+    span.intTex[1] -= FIXED_HALF;                                      \
+@@ -238,7 +241,8 @@ _swrast_culltriangle( GLcontext *ctx,
+       span.z += span.zStep;                                           \
+    }                                                                  \
+    rb->PutRowRGB(ctx, rb, span.end, span.x, span.y,                   \
+-                 span.array->rgb, span.array->mask);
++                 span.array->rgb, span.array->mask);                  \
++}
+ 
+ #include "s_tritemp.h"
+