xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon_glamor.c |    8 +++-----
 src/radeon_glamor.h |   11 +++++++++++
 2 files changed, 14 insertions(+), 5 deletions(-)

New commits:
commit b16609b453bb1a181198cf27778f205dc23fb642
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu Mar 26 17:15:21 2015 +0900

    glamor: Handle GLAMOR_* flags removed from xserver
    
    The behaviour is the same as when the removed flags were passed in.
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
index c49c7f6..e3633ce 100644
--- a/src/radeon_glamor.c
+++ b/src/radeon_glamor.c
@@ -327,11 +327,9 @@ radeon_glamor_init(ScreenPtr screen)
 {
 	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
 
-	if (!glamor_init(screen, GLAMOR_INVERTED_Y_AXIS | GLAMOR_USE_EGL_SCREEN |
-#ifdef GLAMOR_NO_DRI3
-			 GLAMOR_NO_DRI3 |
-#endif
-			 GLAMOR_USE_SCREEN | GLAMOR_USE_PICTURE_SCREEN)) {
+	if (!glamor_init(screen, GLAMOR_USE_EGL_SCREEN | GLAMOR_USE_SCREEN |
+			 GLAMOR_USE_PICTURE_SCREEN | GLAMOR_INVERTED_Y_AXIS |
+			 GLAMOR_NO_DRI3)) {
 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 			   "Failed to initialize glamor.\n");
 		return FALSE;
diff --git a/src/radeon_glamor.h b/src/radeon_glamor.h
index 7cef1a9..a504acb 100644
--- a/src/radeon_glamor.h
+++ b/src/radeon_glamor.h
@@ -36,10 +36,21 @@
 #include "radeon_surface.h"
 
 #ifndef GLAMOR_NO_DRI3
+#define GLAMOR_NO_DRI3 0
 #define glamor_fd_from_pixmap glamor_dri3_fd_from_pixmap
 #define glamor_pixmap_from_fd glamor_egl_dri3_pixmap_from_fd
 #endif
 
+#ifndef GLAMOR_INVERTED_Y_AXIS
+#define GLAMOR_INVERTED_Y_AXIS 0
+#endif
+#ifndef GLAMOR_USE_SCREEN
+#define GLAMOR_USE_SCREEN 0
+#endif
+#ifndef GLAMOR_USE_PICTURE_SCREEN
+#define GLAMOR_USE_PICTURE_SCREEN 0
+#endif
+
 Bool radeon_glamor_pre_init(ScrnInfoPtr scrn);
 Bool radeon_glamor_init(ScreenPtr screen);
 Bool radeon_glamor_create_screen_resources(ScreenPtr screen);