diff options
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r-- | src/mesa/drivers/dri/common/dri_util.c | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/r200/r200_blit.c | 6 | ||||
-rw-r--r-- | src/mesa/drivers/dri/r200/r200_texstate.c | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_blit.c | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_screen.c | 6 | ||||
-rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_texture.c | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index 3fb376c24f0..3a03e4d0b01 100644 --- a/src/mesa/drivers/dri/common/dri_util.c +++ b/src/mesa/drivers/dri/common/dri_util.c @@ -932,7 +932,7 @@ static const struct { .image_format = __DRI_IMAGE_FORMAT_R8, .mesa_format = MESA_FORMAT_L_UNORM8, }, -#if PIPE_ARCH_LITTLE_ENDIAN +#if UTIL_ARCH_LITTLE_ENDIAN { .image_format = __DRI_IMAGE_FORMAT_GR88, .mesa_format = MESA_FORMAT_RG_UNORM8, @@ -958,7 +958,7 @@ static const struct { .image_format = __DRI_IMAGE_FORMAT_R16, .mesa_format = MESA_FORMAT_L_UNORM16, }, -#if PIPE_ARCH_LITTLE_ENDIAN +#if UTIL_ARCH_LITTLE_ENDIAN { .image_format = __DRI_IMAGE_FORMAT_GR1616, .mesa_format = MESA_FORMAT_RG_UNORM16, diff --git a/src/mesa/drivers/dri/r200/r200_blit.c b/src/mesa/drivers/dri/r200/r200_blit.c index 20e8d8a58ae..ae4968fd95e 100644 --- a/src/mesa/drivers/dri/r200/r200_blit.c +++ b/src/mesa/drivers/dri/r200/r200_blit.c @@ -43,7 +43,7 @@ unsigned r200_check_blit(mesa_format mesa_format, uint32_t dst_pitch) { /* XXX others? */ switch (mesa_format) { -#if PIPE_ARCH_LITTLE_ENDIAN +#if UTIL_ARCH_LITTLE_ENDIAN case MESA_FORMAT_B8G8R8A8_UNORM: case MESA_FORMAT_B8G8R8X8_UNORM: case MESA_FORMAT_B5G6R5_UNORM: @@ -121,7 +121,7 @@ static void inline emit_tx_setup(struct r200_context *r200, assert(height <= 2048); assert(offset % 32 == 0); -#if PIPE_ARCH_LITTLE_ENDIAN +#if UTIL_ARCH_LITTLE_ENDIAN txformat |= tx_table_le[src_mesa_format].format; #else txformat |= tx_table_be[src_mesa_format].format; @@ -170,7 +170,7 @@ static void inline emit_tx_setup(struct r200_context *r200, break; case MESA_FORMAT_A8B8G8R8_UNORM: case MESA_FORMAT_R8G8B8A8_UNORM: -#if PIPE_ARCH_LITTLE_ENDIAN +#if UTIL_ARCH_LITTLE_ENDIAN if (dst_mesa_format == MESA_FORMAT_A8B8G8R8_UNORM) { #else if (dst_mesa_format == MESA_FORMAT_R8G8B8A8_UNORM) { diff --git a/src/mesa/drivers/dri/r200/r200_texstate.c b/src/mesa/drivers/dri/r200/r200_texstate.c index 4bbe2c45563..b227fbbfdf9 100644 --- a/src/mesa/drivers/dri/r200/r200_texstate.c +++ b/src/mesa/drivers/dri/r200/r200_texstate.c @@ -1308,7 +1308,7 @@ static void setup_hardware_state(r200ContextPtr rmesa, radeonTexObj *t) if (!t->image_override) { if (VALID_FORMAT(firstImage->TexFormat)) { -#if PIPE_ARCH_LITTLE_ENDIAN +#if UTIL_ARCH_LITTLE_ENDIAN const struct tx_table *table = tx_table_le; #else const struct tx_table *table = tx_table_be; diff --git a/src/mesa/drivers/dri/radeon/radeon_blit.c b/src/mesa/drivers/dri/radeon/radeon_blit.c index 816d624b885..c186e5bbdae 100644 --- a/src/mesa/drivers/dri/radeon/radeon_blit.c +++ b/src/mesa/drivers/dri/radeon/radeon_blit.c @@ -43,7 +43,7 @@ unsigned r100_check_blit(mesa_format mesa_format, uint32_t dst_pitch) { /* XXX others? */ switch (mesa_format) { -#if PIPE_ARCH_LITTLE_ENDIAN +#if UTIL_ARCH_LITTLE_ENDIAN case MESA_FORMAT_B8G8R8A8_UNORM: case MESA_FORMAT_B8G8R8X8_UNORM: case MESA_FORMAT_B5G6R5_UNORM: diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c index 2469982ae13..cde35d3abf6 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c @@ -697,21 +697,21 @@ radeonCreateBuffer( __DRIscreen *driScrnPriv, if (mesaVis->redBits == 5) rgbFormat = -#if PIPE_ARCH_LITTLE_ENDIAN +#if UTIL_ARCH_LITTLE_ENDIAN MESA_FORMAT_B5G6R5_UNORM; #else MESA_FORMAT_R5G6B5_UNORM; #endif else if (mesaVis->alphaBits == 0) rgbFormat = -#if PIPE_ARCH_LITTLE_ENDIAN +#if UTIL_ARCH_LITTLE_ENDIAN MESA_FORMAT_B8G8R8X8_UNORM; #else MESA_FORMAT_X8R8G8B8_UNORM; #endif else rgbFormat = -#if PIPE_ARCH_LITTLE_ENDIAN +#if UTIL_ARCH_LITTLE_ENDIAN MESA_FORMAT_B8G8R8A8_UNORM; #else MESA_FORMAT_A8R8G8B8_UNORM; diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c index c8f1b07d31c..069edc93a42 100644 --- a/src/mesa/drivers/dri/radeon/radeon_texture.c +++ b/src/mesa/drivers/dri/radeon/radeon_texture.c @@ -602,7 +602,7 @@ mesa_format _radeon_texformat_argb1555 = MESA_FORMAT_NONE; static void radeonInitTextureFormats(void) { -#if PIPE_ARCH_LITTLE_ENDIAN +#if UTIL_ARCH_LITTLE_ENDIAN _radeon_texformat_rgba8888 = MESA_FORMAT_A8B8G8R8_UNORM; _radeon_texformat_argb8888 = MESA_FORMAT_B8G8R8A8_UNORM; _radeon_texformat_rgb565 = MESA_FORMAT_B5G6R5_UNORM; |