diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-06-07 21:56:04 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-06-07 23:12:21 +0100 |
| commit | 318982566bbc7145847bd03601087150eef7a8d8 (patch) | |
| tree | 3767b4190d920bf64061fc571a8df6d802e51e32 | |
| parent | ebf84b8e572b5cb1a509000d412dfa5be3d1aca3 (diff) | |
sna/dri: Disable experimental code by default
Since these require non-upstream patches to other components, we don't
want it enabled by default and randomly breaking builds.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | src/sna/sna_dri.c | 6 |
2 files changed, 13 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index a025521c..cb740a7b 100644 --- a/configure.ac +++ b/configure.ac @@ -197,7 +197,7 @@ AC_MSG_RESULT($accel) AC_ARG_ENABLE(vmap, AS_HELP_STRING([--enable-vmap], - [Enable use of vmap [default=no]]), + [Enable use of vmap (experimental) [default=no]]), [VMAP="$enableval"], [VMAP=no]) AM_CONDITIONAL(USE_VMAP, test x$VMAP = xyes) @@ -205,6 +205,15 @@ if test "x$VMAP" = xyes; then AC_DEFINE(USE_VMAP,1,[Assume VMAP support]) fi +AC_ARG_ENABLE(async-swap, + AS_HELP_STRING([--enable-async-swap], + [Enable use of asynchronous swaps (experimental) [default=no]]), + [ASYNC_SWAP="$enableval"], + [ASYNC_SWAP=no]) +AM_CONDITIONAL(USE_ASYNC_SWAP, test x$ASYNC_SWAP = xyes) +if test "x$ASYNC_SWAP" = xyes; then + AC_DEFINE(USE_ASYNC_SWAP,1,[Assume asynchronous swap support]) +fi AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c index da49e12b..b9f9b85a 100644 --- a/src/sna/sna_dri.c +++ b/src/sna/sna_dri.c @@ -1232,7 +1232,7 @@ static void sna_dri_flip_event(struct sna *sna, sna_dri_frame_event_info_free(flip); break; -#if DRI2INFOREC_VERSION >= 7 +#if USE_ASYNC_SWAP && DRI2INFOREC_VERSION >= 7 case DRI2_ASYNC_FLIP: DBG(("%s: async swap flip completed on pipe %d, pending? %d, new? %d\n", __FUNCTION__, flip->pipe, @@ -1700,7 +1700,7 @@ blit_fallback: return TRUE; } -#if DRI2INFOREC_VERSION >= 7 +#if USE_ASYNC_SWAP && DRI2INFOREC_VERSION >= 7 static void sna_dri_exchange_attachment(DRI2BufferPtr front, DRI2BufferPtr back) { @@ -2070,7 +2070,7 @@ Bool sna_dri_open(struct sna *sna, ScreenPtr screen) info.ReuseBufferNotify = NULL; #endif -#if DRI2INFOREC_VERSION >= 7 +#if USE_AYSYNC_SWAP && DRI2INFOREC_VERSION >= 7 info.version = 7; info.AsyncSwap = sna_dri_async_swap; #endif |