[PATCH 1/2] dri2: Fix conflicting CreatePixmap usage flag definitions

[Michel Dänzer]

From: Michel Dänzer <michel.daenzer at amd.com>

RADEON_CREATE_PIXMAP_TILING_MICRO_SQUARE was the same as
RADEON_CREATE_PIXMAP_DRI2.

Disambiguate the definitions and rearrange them to try and prevent this
from happening again.

Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
---
 src/radeon.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/radeon.h b/src/radeon.h
index f1817e7..f364b67 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -786,12 +786,12 @@ static __inline__ void RADEON_SYNC(RADEONInfoPtr info, ScrnInfoPtr pScrn)
 }
 
 enum {
-    RADEON_CREATE_PIXMAP_DRI2 = 0x08000000,
-    RADEON_CREATE_PIXMAP_TILING_MACRO = 0x10000000,
-    RADEON_CREATE_PIXMAP_TILING_MICRO = 0x20000000,
-    RADEON_CREATE_PIXMAP_DEPTH = 0x40000000, /* for r200 */
-    RADEON_CREATE_PIXMAP_SZBUFFER = 0x80000000, /* for eg */
-    RADEON_CREATE_PIXMAP_TILING_MICRO_SQUARE = 0x8000000,
+    RADEON_CREATE_PIXMAP_DRI2			= 0x04000000,
+    RADEON_CREATE_PIXMAP_TILING_MICRO_SQUARE	= 0x08000000,
+    RADEON_CREATE_PIXMAP_TILING_MACRO		= 0x10000000,
+    RADEON_CREATE_PIXMAP_TILING_MICRO		= 0x20000000,
+    RADEON_CREATE_PIXMAP_DEPTH			= 0x40000000, /* for r200 */
+    RADEON_CREATE_PIXMAP_SZBUFFER		= 0x80000000, /* for eg */
 };
 
 
-- 
1.9.0