Mesa (master): nouveau: Convert to use GLbitfield64 directly.

[Mathias Fröhlich]

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

Author: Mathias Fröhlich <Mathias.Froehlich at web.de>
Date:   Thu Dec 22 20:12:20 2011 +0100

nouveau: Convert to use GLbitfield64 directly.

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

---

 src/mesa/drivers/dri/nouveau/nouveau_swtnl_t.c |    2 +-
 src/mesa/drivers/dri/nouveau/nv04_render.c     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_swtnl_t.c b/src/mesa/drivers/dri/nouveau/nouveau_swtnl_t.c
index f084f89..26c4c7e 100644
--- 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 ad45093..3061ae5 100644
--- 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,