xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon_glamor.h |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 4b0997e56dec0053cb2cb793e0f4ae35055ff7e6
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed Mar 18 12:30:09 2015 +0900

    glamor: Add glamor_fd_from_pixmap define for standalone glamor tree

diff --git a/src/radeon_glamor.h b/src/radeon_glamor.h
index c402a10..f450f0e 100644
--- a/src/radeon_glamor.h
+++ b/src/radeon_glamor.h
@@ -35,6 +35,10 @@
 
 #include "radeon_surface.h"
 
+#ifndef GLAMOR_NO_DRI3
+#define glamor_fd_from_pixmap glamor_dri3_fd_from_pixmap
+#endif
+
 Bool radeon_glamor_pre_init(ScrnInfoPtr scrn);
 Bool radeon_glamor_init(ScreenPtr screen);
 Bool radeon_glamor_create_screen_resources(ScreenPtr screen);