diff options
| author | Eric Anholt <eric@anholt.net> | 2014-04-09 15:24:21 -0700 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-04-10 09:07:38 +0100 |
| commit | a6919aa980883cf2828dc0cf813f315e3035d0cf (patch) | |
| tree | 7dab5eeacea11439eedb6e43807c8146b57b1537 | |
| parent | be7c166a017cee3ef8a1b7b290b7fb14b4009314 (diff) | |
Update for glamor in the 1.16 server.
We should link against the server's copy, insted of using the external
library.
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/uxa/intel_glamor.c | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 75428989..0fdbc3c8 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/src/uxa/intel_glamor.c b/src/uxa/intel_glamor.c index e1e2a742..d38d381b 100644 --- a/src/uxa/intel_glamor.c +++ b/src/uxa/intel_glamor.c @@ -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; |