Mesa (master): r600g: Use EG constants in EG r600_colorformat_endian_swap() .

Henri Verbeet hverbeet at kemper.freedesktop.org
Mon Apr 25 05:07:15 PDT 2011


Module: Mesa
Branch: master
Commit: 32001c2244521a606ab210cd3a3fea3481131879
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=32001c2244521a606ab210cd3a3fea3481131879

Author: Henri Verbeet <hverbeet at gmail.com>
Date:   Mon Apr 25 13:28:55 2011 +0200

r600g: Use EG constants in EG r600_colorformat_endian_swap().

This would actually fail to compile when PIPE_ARCH_BIG_ENDIAN is defined.

Signed-off-by: Henri Verbeet <hverbeet at gmail.com>

---

 src/gallium/drivers/r600/eg_state_inlines.h |   42 +++++++++++++-------------
 1 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/gallium/drivers/r600/eg_state_inlines.h b/src/gallium/drivers/r600/eg_state_inlines.h
index a67e72e..1ceea0b 100644
--- a/src/gallium/drivers/r600/eg_state_inlines.h
+++ b/src/gallium/drivers/r600/eg_state_inlines.h
@@ -510,44 +510,44 @@ static INLINE uint32_t r600_colorformat_endian_swap(uint32_t colorformat)
 {
 #ifdef PIPE_ARCH_BIG_ENDIAN
 	switch(colorformat) {
-	case V_0280A0_COLOR_4_4:
+	case V_028C70_COLOR_4_4:
 		return(ENDIAN_NONE);
 
 		/* 8-bit buffers. */
-	case V_0280A0_COLOR_8:
+	case V_028C70_COLOR_8:
 		return(ENDIAN_NONE);
 
 		/* 16-bit buffers. */
-	case V_0280A0_COLOR_5_6_5:
-	case V_0280A0_COLOR_1_5_5_5:
-	case V_0280A0_COLOR_4_4_4_4:
-	case V_0280A0_COLOR_16:
-	case V_0280A0_COLOR_8_8:
+	case V_028C70_COLOR_5_6_5:
+	case V_028C70_COLOR_1_5_5_5:
+	case V_028C70_COLOR_4_4_4_4:
+	case V_028C70_COLOR_16:
+	case V_028C70_COLOR_8_8:
 		return(ENDIAN_8IN16);
 
 		/* 32-bit buffers. */
-	case V_0280A0_COLOR_8_8_8_8:
-	case V_0280A0_COLOR_2_10_10_10:
-	case V_0280A0_COLOR_8_24:
-	case V_0280A0_COLOR_24_8:
-	case V_0280A0_COLOR_32_FLOAT:
-	case V_0280A0_COLOR_16_16_FLOAT:
-	case V_0280A0_COLOR_16_16:
+	case V_028C70_COLOR_8_8_8_8:
+	case V_028C70_COLOR_2_10_10_10:
+	case V_028C70_COLOR_8_24:
+	case V_028C70_COLOR_24_8:
+	case V_028C70_COLOR_32_FLOAT:
+	case V_028C70_COLOR_16_16_FLOAT:
+	case V_028C70_COLOR_16_16:
 		return(ENDIAN_8IN32);
 
 		/* 64-bit buffers. */
-	case V_0280A0_COLOR_16_16_16_16:
-	case V_0280A0_COLOR_16_16_16_16_FLOAT:
+	case V_028C70_COLOR_16_16_16_16:
+	case V_028C70_COLOR_16_16_16_16_FLOAT:
 		return(ENDIAN_8IN16);
 
-	case V_0280A0_COLOR_32_32_FLOAT:
-	case V_0280A0_COLOR_32_32:
+	case V_028C70_COLOR_32_32_FLOAT:
+	case V_028C70_COLOR_32_32:
 		return(ENDIAN_8IN32);
 
 		/* 128-bit buffers. */
-	case V_0280A0_COLOR_32_32_32_FLOAT:
-	case V_0280A0_COLOR_32_32_32_32_FLOAT:
-	case V_0280A0_COLOR_32_32_32_32:
+	case V_028C70_COLOR_32_32_32_FLOAT:
+	case V_028C70_COLOR_32_32_32_32_FLOAT:
+	case V_028C70_COLOR_32_32_32_32:
 		return(ENDIAN_8IN32);
 	default:
 		return ENDIAN_NONE; /* Unsupported. */



More information about the mesa-commit mailing list