diff options
| author | rillig <rillig@pkgsrc.org> | 2006-01-30 08:54:55 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-01-30 08:54:55 +0000 |
| commit | e315e7254afae2646bc689c31ca0a3e000360f05 (patch) | |
| tree | 46dbdf69714a9acfbe42dba89f0fe2e995db6c7d /graphics | |
| parent | b0712984e6c132eb8b09821f8d42c51f550ab225 (diff) | |
| download | pkgsrc-e315e7254afae2646bc689c31ca0a3e000360f05.tar.gz | |
That evil macro RENDER_SPAN is defined twice -- I only catched one in the
first try.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/MesaLib/distinfo | 4 | ||||
| -rw-r--r-- | graphics/MesaLib/patches/patch-ak | 24 |
2 files changed, 23 insertions, 5 deletions
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo index 9708eb54c82..c10929dd7ae 100644 --- a/graphics/MesaLib/distinfo +++ b/graphics/MesaLib/distinfo @@ -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-ag) = 722234c02093e0d3b10659fa83bb14c7f2e7a8ac SHA1 (patch-ah) = b9ee33c497b8abe2af004a4f13219a19f413f30e SHA1 (patch-ai) = 3c5e4cc1e054514111d50c1d01257f4647b14558 SHA1 (patch-aj) = a805947e1aaf73a798fd3a8c6e39bf1bd62afc3a -SHA1 (patch-ak) = 6c0d2d3b9a6b0c237b541c9c352584be5a7c66d1 +SHA1 (patch-ak) = 3cce21b97f828895e73aa75469ce75de4f84be83 diff --git a/graphics/MesaLib/patches/patch-ak b/graphics/MesaLib/patches/patch-ak index a8a6ed3244a..b63e40f309c 100644 --- a/graphics/MesaLib/patches/patch-ak +++ b/graphics/MesaLib/patches/patch-ak @@ -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 @@ by an additional opening brace. #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" + |