From: Jakob Bornecrantz <jakob@vmware.com>
Date: Fri, 15 Jan 2010 01:14:55 +0000 (+0000)
Subject: st/xorg: Set enforce version to 1 if not defined
X-Git-Tag: mesa-7.8~1360^2~114
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e1241d4f872cca96616edcbdcaea5b59d37e78f;p=platform%2Fupstream%2Fmesa.git

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 4fa4754..4f03dba 100644
--- 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 */
-/* XXX can it be set to 1? */
 #ifndef DRI2INFOREC_VERSION
-#define DRI2INFOREC_VERSION 0
+#define DRI2INFOREC_VERSION 1
 #endif
 
 typedef struct {
@@ -370,11 +369,7 @@ xorg_dri2_init(ScreenPtr pScreen)
     modesettingPtr ms = modesettingPTR(pScrn);
     DRI2InfoRec dri2info;
 
-#if DRI2INFOREC_VERSION >= 2
     dri2info.version = DRI2INFOREC_VERSION;
-#else
-    dri2info.version = 1;
-#endif
     dri2info.fd = ms->fd;
 
     dri2info.driverName = pScrn->driverName;