diff options
| author | Eric Anholt <eric@anholt.net> | 2013-12-27 17:14:41 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-02-24 17:36:24 -0800 |
| commit | cf921a2bd92b183488038432a8b6fa2855ec7948 (patch) | |
| tree | 53fb35f2bfab3ed4f1b6a3acf96e3840baed7b0f | |
| parent | 0c90cf51b7a805d321647ce5dd18b0ab336be148 (diff) | |
Update for glamor in the 1.16 server.glamor-dri3
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/uxa/intel_dri3.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 808c2476..e0c60296 100644 --- a/configure.ac +++ b/configure.ac @@ -324,8 +324,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.3.1]) - PKG_CHECK_MODULES(LIBGLAMOR_EGL, [glamor-egl]) + if ! pkg-config --exists "xorg-server >= 1.15.99.901"; then + PKG_CHECK_MODULES(LIBGLAMOR, [glamor >= 0.3.1]) + PKG_CHECK_MODULES(LIBGLAMOR_EGL, [glamor-egl]) + fi AC_DEFINE(USE_GLAMOR, 1, [Enable glamor acceleration]) fi diff --git a/src/uxa/intel_dri3.c b/src/uxa/intel_dri3.c index 940d880c..6fc3448c 100644 --- a/src/uxa/intel_dri3.c +++ b/src/uxa/intel_dri3.c @@ -181,5 +181,9 @@ static dri3_screen_info_rec intel_dri3_screen_info = { Bool intel_dri3_screen_init(ScreenPtr screen) { + /* glamor handles DRI3 on its own. */ + if (intel->uxa_flags & UXA_USE_GLAMOR) + return; + return dri3_screen_init(screen, &intel_dri3_screen_info); } |