st/xorg: Set enforce version to 1 if not defined

diff --git a/src/gallium/state_trackers/xorg/xorg_dri2.c b/src/gallium/state_trackers/xorg/xorg_dri2.c
index 4fa47548a43f2dc664ebc6c9072f9bedf87e7dc6..4f03dbae742956a136860a77d8a8abfc79d96c67 100644 (file)
--- a/src/gallium/state_trackers/xorg/xorg_dri2.c
+++ b/src/gallium/state_trackers/xorg/xorg_dri2.c
@@ -43,9 +43,8 @@
 #include "util/u_rect.h"
 
 /* Make all the #if cases in the code esier to read */
 #include "util/u_rect.h"
 
 /* Make all the #if cases in the code esier to read */

-/* XXX can it be set to 1? */

 #ifndef DRI2INFOREC_VERSION
 #ifndef DRI2INFOREC_VERSION

-#define DRI2INFOREC_VERSION 0
+#define DRI2INFOREC_VERSION 1

 #endif
 
 typedef struct {
 #endif
 
 typedef struct {


@@ -370,11 +369,7 @@ xorg_dri2_init(ScreenPtr pScreen)
     modesettingPtr ms = modesettingPTR(pScrn);
     DRI2InfoRec dri2info;
 
     modesettingPtr ms = modesettingPTR(pScrn);
     DRI2InfoRec dri2info;
 

-#if DRI2INFOREC_VERSION >= 2

     dri2info.version = DRI2INFOREC_VERSION;
     dri2info.version = DRI2INFOREC_VERSION;

-#else
-    dri2info.version = 1;
-#endif

     dri2info.fd = ms->fd;
 
     dri2info.driverName = pScrn->driverName;
     dri2info.fd = ms->fd;
 
     dri2info.driverName = pScrn->driverName;