xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon_dri3.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit fcd37f65f485291084c174666bd605e215bf1398
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed Mar 18 10:39:03 2015 +0900

    DRI3: Use open hook instead of open_client
    
    We don't need the client pointer, and this allows it to work with older
    versions of xserver as well.

diff --git a/src/radeon_dri3.c b/src/radeon_dri3.c
index 1413a62..ea0f28b 100644
--- a/src/radeon_dri3.c
+++ b/src/radeon_dri3.c
@@ -41,10 +41,7 @@
 
 
 static int
-radeon_dri3_open_client(ClientPtr client,
-			ScreenPtr screen,
-			RRProviderPtr provider,
-			int *out)
+radeon_dri3_open(ScreenPtr screen, RRProviderPtr provider, int *out)
 {
 	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
 	RADEONInfoPtr info = RADEONPTR(scrn);
@@ -162,9 +159,9 @@ static int radeon_dri3_fd_from_pixmap(ScreenPtr screen,
 }
 
 static dri3_screen_info_rec radeon_dri3_screen_info = {
-	.version = 1,
+	.version = 0,
 
-	.open_client = radeon_dri3_open_client,
+	.open = radeon_dri3_open,
 	.pixmap_from_fd = radeon_dri3_pixmap_from_fd,
 	.fd_from_pixmap = radeon_dri3_fd_from_pixmap
 };