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

Update for glamor in the 1.16 server. 

We should link against the server's copy, insted of using the external
library.
This commit is contained in:
Eric Anholt 2014-04-09 15:24:21 -07:00 committed by Chris Wilson
parent be7c166a01
commit a6919aa980
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -344,8 +344,10 @@ if test "x$GLAMOR" != "xno"; then
if test "x$UXA" != "xyes"; then
AC_MSG_ERROR([Glamor acceleration requested but UXA is not enabled])
fi
PKG_CHECK_MODULES(LIBGLAMOR, [glamor >= 0.6.0])
PKG_CHECK_MODULES(LIBGLAMOR_EGL, [glamor-egl])
if ! pkg-config --exists "xorg-server >= 1.15.99.901"; then
PKG_CHECK_MODULES(LIBGLAMOR, [glamor >= 0.6.0])
PKG_CHECK_MODULES(LIBGLAMOR_EGL, [glamor-egl])
fi
AC_DEFINE(USE_GLAMOR, 1, [Enable glamor acceleration])
fi

8
src/uxa/intel_glamor.c
View File

@ -219,7 +219,13 @@ intel_glamor_init(ScreenPtr screen)
if ((intel->uxa_flags & UXA_GLAMOR_EGL_INITIALIZED) == 0)
goto fail;
if (!glamor_init(screen, GLAMOR_INVERTED_Y_AXIS | GLAMOR_USE_EGL_SCREEN)) {
if (!glamor_init(screen,
#if defined(GLAMOR_NO_DRI3)
/* Not doing DRI3 yet, since Present support hasn't landed. */
GLAMOR_NO_DRI3 |
#endif
GLAMOR_INVERTED_Y_AXIS |
GLAMOR_USE_EGL_SCREEN)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Failed to initialize glamor.\n");
goto fail;