[PATCH 2/2] glamor: Move declaration of struct radeon_pixmap out of #if/#else blocks

Michel Dänzer michel at daenzer.net
Thu Jul 30 00:00:28 PDT 2015


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

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

diff --git a/src/radeon_glamor.h b/src/radeon_glamor.h
index c77466e..246336b 100644
--- a/src/radeon_glamor.h
+++ b/src/radeon_glamor.h
@@ -28,6 +28,9 @@
 #define RADEON_GLAMOR_H
 
 #include "xf86xv.h"
+
+struct radeon_pixmap;
+
 #ifdef USE_GLAMOR
 
 #define GLAMOR_FOR_XORG  1
@@ -43,8 +46,6 @@
 	(((usage) & ~RADEON_CREATE_PIXMAP_TILING_FLAGS) == RADEON_CREATE_PIXMAP_DRI2 || \
 	 (usage) == CREATE_PIXMAP_USAGE_SHARED)
 
-struct radeon_pixmap;
-
 #ifndef GLAMOR_NO_DRI3
 #define GLAMOR_NO_DRI3 0
 #define glamor_fd_from_pixmap glamor_dri3_fd_from_pixmap
@@ -74,8 +75,6 @@ XF86VideoAdaptorPtr radeon_glamor_xv_init(ScreenPtr pScreen, int num_adapt);
 
 #else
 
-struct radeon_pixmap;
-
 static inline Bool radeon_glamor_pre_init(ScrnInfoPtr scrn) { return FALSE; }
 static inline Bool radeon_glamor_init(ScreenPtr screen) { return FALSE; }
 static inline Bool radeon_glamor_create_screen_resources(ScreenPtr screen) { return FALSE; }
-- 
2.1.4



More information about the xorg-driver-ati mailing list