diff options
| author | marha <marha@users.sourceforge.net> | 2011-08-10 08:42:07 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-08-10 08:42:07 +0200 |
| commit | 8e57a7fcbf736b8e437baf0bbccb93095d97617f (patch) | |
| tree | ee3344cfe8cfa5ce370892e341dec494e7d95787 /mesalib/src/mesa/swrast | |
| parent | 4a9b92fdef532c911a0ac7d52e8ce2e77d424a18 (diff) | |
| parent | fd1f4d9fe3ea67fa6def8ee4927a8f71e0440f12 (diff) | |
| download | vcxsrv-8e57a7fcbf736b8e437baf0bbccb93095d97617f.tar.gz vcxsrv-8e57a7fcbf736b8e437baf0bbccb93095d97617f.tar.bz2 vcxsrv-8e57a7fcbf736b8e437baf0bbccb93095d97617f.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/docs/GL3.txt
Diffstat (limited to 'mesalib/src/mesa/swrast')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_span.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/swrast/s_span.c b/mesalib/src/mesa/swrast/s_span.c index db102ac79..9a91be399 100644 --- a/mesalib/src/mesa/swrast/s_span.c +++ b/mesalib/src/mesa/swrast/s_span.c @@ -212,10 +212,10 @@ interpolate_active_attribs(struct gl_context *ctx, SWspan *span, GLbitfield attr static INLINE void interpolate_int_colors(struct gl_context *ctx, SWspan *span) { +#if CHAN_BITS != 32 const GLuint n = span->end; GLuint i; -#if CHAN_BITS != 32 ASSERT(!(span->arrayMask & SPAN_RGBA)); #endif |