summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@vmware.com>2010-01-15 01:14:55 +0000
committerJakob Bornecrantz <jakob@vm-x-u910-32.(none)>2010-01-15 01:38:04 +0000
commit3e1241d4f872cca96616edcbdcaea5b59d37e78f (patch)
tree95972fdd3574ae013a4f6855ab0befcb723313a4
parentae97520e37ee70c813a198c805c7338aefbd8156 (diff)
st/xorg: Set enforce version to 1 if not defined
-rw-r--r--src/gallium/state_trackers/xorg/xorg_dri2.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/gallium/state_trackers/xorg/xorg_dri2.c b/src/gallium/state_trackers/xorg/xorg_dri2.c
index 4fa47548a4..4f03dbae74 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;