nouveau: Convert to use GLbitfield64 directly.

Signed-off-by: Mathias Froehlich <Mathias.Froehlich@web.de>
Reviewed-by: Brian Paul <brianp@vmare.com>

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_swtnl_t.c b/src/mesa/drivers/dri/nouveau/nouveau_swtnl_t.c
index f084f89d29ef9066e56439220e25fe21330eb3ff..26c4c7ee2d75514b0622bec363276b07fa7f45aa 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_swtnl_t.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_swtnl_t.c
@@ -123,7 +123,7 @@ swtnl_choose_attrs(struct gl_context *ctx)
                if (!sa->fields)
                        continue; /* Unsupported attribute. */
 
-               if (RENDERINPUTS_TEST(tnl->render_inputs_bitset, i)) {
+               if (tnl->render_inputs_bitset & BITFIELD64_BIT(i)) {
                        if (sa->fields > 0)
                                fields = sa->fields;
                        else

diff --git a/src/mesa/drivers/dri/nouveau/nv04_render.c b/src/mesa/drivers/dri/nouveau/nv04_render.c
index ad45093edd1f10531b4bfa1859bd15aecb2d83cc..3061ae5f552a62a5873161d62acda6a7905c4520 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv04_render.c
+++ b/src/mesa/drivers/dri/nouveau/nv04_render.c
@@ -55,7 +55,7 @@ swtnl_emit_attr(struct gl_context *ctx, struct tnl_attr_map *m, int attr, int em
 {
        TNLcontext *tnl = TNL_CONTEXT(ctx);
 
-       if (RENDERINPUTS_TEST(tnl->render_inputs_bitset, attr))
+       if (tnl->render_inputs_bitset & BITFIELD64_BIT(attr))
                *m = (struct tnl_attr_map) {
                        .attrib = attr,
                        .format = emit,