Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna: Correct dependencies for DRI2 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2011-11-15 10:38:09 +00:00
parent 3771387ad1
commit bfd2bb4027
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -175,7 +175,7 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
PKG_CHECK_MODULES(XORG, [xorg-server >= $required_xorg_xserver_version xproto fontsproto pixman-1 >= $required_pixman_version $REQUIRED_MODULES])
PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.23])
PKG_CHECK_MODULES(DRI, [xf86driproto], , DRI=no)
PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6])
PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6],, DRI2=no)
PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
@ -218,6 +218,10 @@ else
AC_MSG_ERROR([DRI requested but prerequisites not found])
fi
fi
AM_CONDITIONAL(DRI2, test x$DRI2 != xno)
if test "x$DRI2" != "xno"; then
AC_DEFINE(USE_DRI2,1,[Enable DRI2 driver support])
fi
if test "$XVMC" = yes; then
PKG_CHECK_MODULES(XVMCLIB,

2
src/sna/Makefile.am
View File

@ -74,7 +74,7 @@ libsna_la_SOURCES = \
gen7_render.h \
$(NULL)
if DRI
if DRI2
libsna_la_SOURCES += \
sna_dri.c \
$(NULL)

2
src/sna/sna_driver.c
View File

@ -925,7 +925,7 @@ sna_screen_init(int scrnIndex, ScreenPtr screen, int argc, char **argv)
xf86DPMSInit(screen, xf86DPMSSet, 0);
sna_video_init(sna, screen);
#ifdef DRI2
#if USE_DRI2
sna->directRenderingOpen = sna_dri_open(sna, screen);
if (sna->directRenderingOpen)
xf86DrvMsg(scrn->scrnIndex, X_INFO,