From 9fb668c57641d68f4b47b8335ea62f21f9773bba Mon Sep 17 00:00:00 2001 From: Felix Kuehling Date: Wed, 15 Dec 2004 15:44:28 +0000 Subject: [PATCH] Fixed some missing uint8_t -> u_int8_t. --- src/mesa/drivers/dri/savage/savage_3d_reg.h | 6 +++--- src/mesa/drivers/dri/savage/savageioctl.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/savage/savage_3d_reg.h b/src/mesa/drivers/dri/savage/savage_3d_reg.h index 24c23d4..b7d1c39 100644 --- a/src/mesa/drivers/dri/savage/savage_3d_reg.h +++ b/src/mesa/drivers/dri/savage/savage_3d_reg.h @@ -637,7 +637,7 @@ typedef struct savage_registers_s4_t { savageRegTexBlendCtrl texBlendCtrl[2]; /* 0x24, 0x25 */ savageRegTexXprClr texXprClr; /* 0x26 */ savageRegTexDescr_s4 texDescr; /* 0x27 */ - uint8_t fogTable[32]; /* 0x28-0x2f (8dwords) */ + u_int8_t fogTable[32]; /* 0x28-0x2f (8dwords) */ savageRegFogCtrl fogCtrl; /* 0x30 */ savageRegStencilCtrl stencilCtrl; /* 0x31 */ savageRegZBufCtrl_s4 zBufCtrl; /* 0x32 */ @@ -655,8 +655,8 @@ typedef struct savage_registers_s3d_t { savageRegTexAddr texAddr; /* 0x1a */ savageRegTexDescr_s3d texDescr; /* 0x1b */ savageRegTexCtrl_s3d texCtrl; /* 0x1c */ - u_int32_t unused1[3]; /* 0x1d-0x1f */ - uint8_t fogTable[64]; /* 0x20-0x2f (16dwords) */ + u_int32_t unused1[3]; /* 0x1d-0x1f */ + u_int8_t fogTable[64]; /* 0x20-0x2f (16dwords) */ savageRegFogCtrl fogCtrl; /* 0x30 */ savageRegDrawCtrl drawCtrl; /* 0x31 */ savageRegZBufCtrl_s3d zBufCtrl; /* 0x32 */ diff --git a/src/mesa/drivers/dri/savage/savageioctl.h b/src/mesa/drivers/dri/savage/savageioctl.h index 87901b5..acf398b 100644 --- a/src/mesa/drivers/dri/savage/savageioctl.h +++ b/src/mesa/drivers/dri/savage/savageioctl.h @@ -89,7 +89,7 @@ u_int32_t *savageAllocDmaLow( savageContextPtr imesa, GLuint bytes ) UNLOCK_HARDWARE(imesa); } - head = (u_int32_t *)((uint8_t *)imesa->vertex_dma_buffer->address + + head = (u_int32_t *)((u_int8_t *)imesa->vertex_dma_buffer->address + imesa->vertex_dma_buffer->used); imesa->vertex_dma_buffer->used += bytes; -- 2.7.4