diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-27 07:40:19 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-27 07:40:19 +0100 |
| commit | b3e4046e8fdcd369e61c237f8690772bf1d8c64f (patch) | |
| tree | 5ff8cf47771eede4f2ea6e7c5980fd584f2b4992 /mesalib/src/mesa/swrast/s_blend.c | |
| parent | b436c1b7e3adefe7068fb030b83ac12a826251d3 (diff) | |
| parent | c4f44c07c6662d1ce08603945ccc4fa5afaa742a (diff) | |
| download | vcxsrv-b3e4046e8fdcd369e61c237f8690772bf1d8c64f.tar.gz vcxsrv-b3e4046e8fdcd369e61c237f8690772bf1d8c64f.tar.bz2 vcxsrv-b3e4046e8fdcd369e61c237f8690772bf1d8c64f.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-mmx.c
Diffstat (limited to 'mesalib/src/mesa/swrast/s_blend.c')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_blend.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/swrast/s_blend.c b/mesalib/src/mesa/swrast/s_blend.c index cd6e6f036..54fffbb45 100644 --- a/mesalib/src/mesa/swrast/s_blend.c +++ b/mesalib/src/mesa/swrast/s_blend.c @@ -998,7 +998,7 @@ _swrast_blend_span(struct gl_context *ctx, struct gl_renderbuffer *rb, SWspan *s SWcontext *swrast = SWRAST_CONTEXT(ctx); void *rbPixels; - ASSERT(span->end <= MAX_WIDTH); + ASSERT(span->end <= SWRAST_MAX_WIDTH); ASSERT(span->arrayMask & SPAN_RGBA); ASSERT(!ctx->Color.ColorLogicOpEnabled); |