Mesa (master): swrast: Use BITFIELD64_BIT for arrayAttribs.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Wed Mar 18 21:52:04 UTC 2015


Module: Mesa
Branch: master
Commit: cebc62f1060c815e3b5a1bd3728c3d909db3d2b8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cebc62f1060c815e3b5a1bd3728c3d909db3d2b8

Author: Jose Fonseca <jfonseca at vmware.com>
Date:   Wed Mar 18 14:25:19 2015 +0000

swrast: Use BITFIELD64_BIT for arrayAttribs.

As VARYING_SLOT_MAX can be bigger than 32.

I'll probably stop building swrast with MSVC in the near future, but this
seems a real bug regardless.

Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/mesa/swrast/s_span.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index 5d618f0..e304b6b 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -788,7 +788,7 @@ clip_span( struct gl_context *ctx, SWspan *span )
          memmove(ARRAY, ARRAY + (SHIFT), (LEN) * sizeof(ARRAY[0]))
 
          for (i = 0; i < VARYING_SLOT_MAX; i++) {
-            if (span->arrayAttribs & (1 << i)) {
+            if (span->arrayAttribs & BITFIELD64_BIT(i)) {
                /* shift array elements left by 'leftClip' */
                SHIFT_ARRAY(span->array->attribs[i], leftClip, n - leftClip);
             }




More information about the mesa-commit mailing list