summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/i810/i810screen.c
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2008-06-25 04:05:11 +1000
committerBen Skeggs <skeggsb@gmail.com>2008-06-25 04:05:11 +1000
commitb40ed6a0b54d1ba74799aeb3f529c4d298625aa1 (patch)
treeda1ae04dcd8c1db1294f3caab9ba28760ccb3f8e /src/mesa/drivers/dri/i810/i810screen.c
parent95fe122f67024f55d555e2816a95409a8b53a49e (diff)
parent0561a293b6596641c0200df7e6580599ecb8b111 (diff)
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/drivers/dri/i810/i810screen.c')
-rw-r--r--src/mesa/drivers/dri/i810/i810screen.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i810/i810screen.c b/src/mesa/drivers/dri/i810/i810screen.c
index 695b996319..733c97b2ad 100644
--- a/src/mesa/drivers/dri/i810/i810screen.c
+++ b/src/mesa/drivers/dri/i810/i810screen.c
@@ -63,11 +63,11 @@ static __GLcontextModes *fill_in_modes( __GLcontextModes *modes,
unsigned num_db_modes,
int visType )
{
- static const u_int8_t bits[1][4] = {
+ static const uint8_t bits[1][4] = {
{ 5, 6, 5, 0 }
};
- static const u_int32_t masks[1][4] = {
+ static const uint32_t masks[1][4] = {
{ 0x0000F800, 0x000007E0, 0x0000001F, 0x00000000 }
};