From: Brian Paul <brianp@vmware.com>
Date: Wed, 15 Sep 2010 18:51:09 +0000 (-0600)
Subject: nv50: use unsigned int for bitfields to silence warnings
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=68cfc8e996fc33ec680c4153e862dcc762e760fc;p=mesa.git

nv50: use unsigned int for bitfields to silence warnings
---

diff --git a/src/gallium/drivers/nv50/nv50_pc.h b/src/gallium/drivers/nv50/nv50_pc.h
index 92c6be5f6e5..080f99f3786 100644
--- a/src/gallium/drivers/nv50/nv50_pc.h
+++ b/src/gallium/drivers/nv50/nv50_pc.h
@@ -239,23 +239,23 @@ struct nv_instruction {
    struct nv_basic_block *bb;
    struct nv_basic_block *target; /* target block of control flow insn */
    ubyte cc;
-   ubyte set_cond      : 4;
-   ubyte fixed         : 1; /* don't optimize away */
-   ubyte is_terminator : 1;
-   ubyte is_join       : 1;
-   ubyte is_long       : 1; /* for emission */
+   unsigned set_cond      : 4;
+   unsigned fixed         : 1; /* don't optimize away */
+   unsigned is_terminator : 1;
+   unsigned is_join       : 1;
+   unsigned is_long       : 1; /* for emission */
    /* */
-   ubyte saturate : 1;
-   ubyte centroid : 1;
-   ubyte flat     : 1;
-   ubyte lanes    : 4;
-   ubyte tex_live : 1;
+   unsigned saturate : 1;
+   unsigned centroid : 1;
+   unsigned flat     : 1;
+   unsigned lanes    : 4;
+   unsigned tex_live : 1;
    /* */
    ubyte tex_t; /* TIC binding */
    ubyte tex_s; /* TSC binding */
-   ubyte tex_argc : 3;
-   ubyte tex_cube : 1;
-   ubyte tex_mask : 4;
+   unsigned tex_argc : 3;
+   unsigned tex_cube : 1;
+   unsigned tex_mask : 4;
    /* */
    ubyte quadop;
 };
diff --git a/src/gallium/drivers/nv50/nv50_program.h b/src/gallium/drivers/nv50/nv50_program.h
index 97d2933c3ee..c92af317f43 100644
--- a/src/gallium/drivers/nv50/nv50_program.h
+++ b/src/gallium/drivers/nv50/nv50_program.h
@@ -32,9 +32,9 @@ struct nv50_varying {
    uint8_t id; /* tgsi index */
    uint8_t hw; /* hw index, nv50 wants flat FP inputs last */
 
-   uint8_t mask   : 4;
-   uint8_t linear : 1;
-   uint8_t pad    : 3;
+   unsigned mask   : 4;
+   unsigned linear : 1;
+   unsigned pad    : 3;
 
    ubyte sn; /* semantic name */
    ubyte si; /* semantic index */