xf86-video-intel: src/sna/sna_dri2.c src/uxa/intel_dri.c

[Chris Wilson]

 src/sna/sna_dri2.c  |    2 +-
 src/uxa/intel_dri.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 986c6977c31a6e33ae4a79969b80a5dcfb15b704
Author: Adel Gadllah <adel.gadllah at gmail.com>
Date:   Mon Jan 19 21:43:46 2015 +0100

    Set the vdpau driver to va_gl
    
    This at least works when the wrapper is installed, there
    is no i9xx vdpau driver. This should for example improve flash which
    only supports vdpau. The expectation is that most software will use vaapi
    in preference for -intel, for example kodi which supports both vdpau and
    vaapi video acceleration methods. [A quick discussion with Peter
    Frühberger clarified that kodi should indeed continue to work fine and
    will not be confused if we expose an actual vdpau driver.]

diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
index 0c54687..08d477e 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -3321,7 +3321,7 @@ bool sna_dri2_open(struct sna *sna, ScreenPtr screen)
 	info.numDrivers = 2;
 	info.driverNames = driverNames;
 	driverNames[0] = info.driverName;
-	driverNames[1] = info.driverName;
+	driverNames[1] = "va_gl";
 #endif
 
 #if DRI2INFOREC_VERSION >= 6
diff --git a/src/uxa/intel_dri.c b/src/uxa/intel_dri.c
index f61c621..e9f3174 100644
--- a/src/uxa/intel_dri.c
+++ b/src/uxa/intel_dri.c
@@ -1544,7 +1544,7 @@ Bool I830DRI2ScreenInit(ScreenPtr screen)
 	info.numDrivers = 2;
 	info.driverNames = driverNames;
 	driverNames[0] = info.driverName;
-	driverNames[1] = info.driverName;
+	driverNames[1] = "va_gl";
 #endif
 
 	return DRI2ScreenInit(screen, &info);