summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomáš Chvátal <scarabeus@gentoo.org>2009-10-31 23:07:07 +0100
committerAlex Deucher <alexdeucher@gmail.com>2009-11-05 10:41:46 -0500
commitb6ac42cce2156880ac18b32e15acbff40b2f53e9 (patch)
tree89f164fedc54e6a796f59dd22b1826b9b60cb503
parent87d7235790866f9c19ef08972d5237f09d940cd9 (diff)
Fix warning about unused defined labels in radeon_exa_funcs.c.
Signed-off-by: Tomáš Chvátal <scarabeus@gentoo.org>
-rw-r--r--src/radeon_exa_funcs.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c
index d5a3103b..1f463d1a 100644
--- a/src/radeon_exa_funcs.c
+++ b/src/radeon_exa_funcs.c
@@ -454,16 +454,18 @@ RADEONUploadToScreenCS(PixmapPtr pDst, int x, int y, int w, int h,
RINFO_FROM_SCREEN(pScreen);
struct radeon_exa_pixmap_priv *driver_priv;
struct radeon_bo *scratch;
- unsigned char *dst;
unsigned size;
- uint32_t datatype = 0;
uint32_t dst_domain;
- uint32_t dst_pitch_offset;
unsigned bpp = pDst->drawable.bitsPerPixel;
uint32_t scratch_pitch = (w * bpp / 8 + 63) & ~63;
- uint32_t swap = RADEON_HOST_DATA_SWAP_NONE;
Bool r;
+#if X_BYTE_ORDER == X_BIG_ENDIAN
+ unsigned char *dst;
+ uint32_t datatype = 0;
+ uint32_t dst_pitch_offset;
+ uint32_t swap = RADEON_HOST_DATA_SWAP_NONE;
int i;
+#endif
if (bpp < 8)
return FALSE;
@@ -512,6 +514,7 @@ RADEONUploadToScreenCS(PixmapPtr pDst, int x, int y, int w, int h,
goto out;
}
+#if X_BYTE_ORDER == X_BIG_ENDIAN
copy:
r = radeon_bo_map(scratch, 0);
if (r) {
@@ -538,7 +541,7 @@ copy:
dst_pitch_offset, 0, 0, x, y, w, h,
RADEON_GEM_DOMAIN_GTT, RADEON_GEM_DOMAIN_VRAM);
}
-
+#endif
out:
if (scratch != driver_priv->bo)
radeon_bo_unref(scratch);
@@ -558,7 +561,9 @@ RADEONDownloadFromScreenCS(PixmapPtr pSrc, int x, int y, int w,
uint32_t src_pitch_offset;
unsigned bpp = pSrc->drawable.bitsPerPixel;
uint32_t scratch_pitch = (w * bpp / 8 + 63) & ~63;
+#if X_BYTE_ORDER == X_BIG_ENDIAN
uint32_t swap = RADEON_HOST_DATA_SWAP_NONE;
+#endif
Bool r;
if (bpp < 8)
@@ -628,6 +633,7 @@ RADEONDownloadFromScreenCS(PixmapPtr pSrc, int x, int y, int w,
RADEON_GEM_DOMAIN_GTT);
FLUSH_RING();
+#if X_BYTE_ORDER == X_BIG_ENDIAN
copy:
r = radeon_bo_map(scratch, 0);
if (r) {
@@ -646,6 +652,7 @@ copy:
dst += dst_pitch;
}
radeon_bo_unmap(scratch);
+#endif
out:
if (scratch != driver_priv->bo)
radeon_bo_unref(scratch);