From 19c46d3d7bd2dc190bb83855c4ffa65a3bc830d7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mathias=20Fr=C3=B6hlich?= Date: Thu, 22 Dec 2011 20:12:20 +0100 Subject: [PATCH] nouveau: Convert to use GLbitfield64 directly. Signed-off-by: Mathias Froehlich Reviewed-by: Brian Paul --- 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, -- 2.7.4