summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Fröhlich <[email protected]>2011-12-22 20:12:20 +0100
committerMathias Fröhlich <[email protected]>2011-12-28 07:35:23 +0100
commit19c46d3d7bd2dc190bb83855c4ffa65a3bc830d7 (patch)
tree631e4245534fa078d398e2b864fc217b84707417
parentb49b1e46425b7ba475b9d78e418dd1fc177786d3 (diff)
nouveau: Convert to use GLbitfield64 directly.
Signed-off-by: Mathias Froehlich <[email protected]> Reviewed-by: Brian Paul <[email protected]>
-rw-r--r--src/mesa/drivers/dri/nouveau/nouveau_swtnl_t.c2
-rw-r--r--src/mesa/drivers/dri/nouveau/nv04_render.c2
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 f084f89d29e..26c4c7ee2d7 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 ad45093edd1..3061ae5f552 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,