diff options
| author | Brian Paul <brianp@vmware.com> | 2010-01-25 14:46:17 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-01-25 14:46:17 -0700 |
| commit | 9b22427911ad27efc1f36faee9462c6082d0417c (patch) | |
| tree | 12e5a6c336e4ca2a71b754120dfcc183f09ae58c /src/gallium/state_trackers/xorg/xorg_dri2.c | |
| parent | 7e7f8815fbfa21ab2397e673fa19c36603bc7a51 (diff) | |
| parent | 6749310d3f60df70ad8f82db986871ab9496793b (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/mesa/drivers/dri/intel/intel_screen.c
src/mesa/drivers/dri/intel/intel_swapbuffers.c
src/mesa/drivers/dri/r300/r300_emit.c
src/mesa/drivers/dri/r300/r300_ioctl.c
src/mesa/drivers/dri/r300/r300_tex.c
src/mesa/drivers/dri/r300/r300_texstate.c
Diffstat (limited to 'src/gallium/state_trackers/xorg/xorg_dri2.c')
| -rw-r--r-- | src/gallium/state_trackers/xorg/xorg_dri2.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gallium/state_trackers/xorg/xorg_dri2.c b/src/gallium/state_trackers/xorg/xorg_dri2.c index e6a89c7645..11b81c9ce2 100644 --- a/src/gallium/state_trackers/xorg/xorg_dri2.c +++ b/src/gallium/state_trackers/xorg/xorg_dri2.c @@ -376,6 +376,7 @@ xorg_dri2_init(ScreenPtr pScreen) ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; modesettingPtr ms = modesettingPTR(pScrn); DRI2InfoRec dri2info; +#if DRI2INFOREC_VERSION >= 2 int major, minor; if (xf86LoaderCheckSymbol("DRI2Version")) { @@ -385,6 +386,7 @@ xorg_dri2_init(ScreenPtr pScreen) major = 1; minor = 0; } +#endif dri2info.version = DRI2INFOREC_VERSION; dri2info.fd = ms->fd; |