diff options
author | marha <marha@users.sourceforge.net> | 2013-12-27 19:26:33 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-12-27 19:26:33 +0100 |
commit | 68c12003597662f95eac07ddeee99637f7caa3e5 (patch) | |
tree | 7be6c75560e85d73363da29707ed674ecf11552f | |
parent | e8eef3451671e4bea36194c85c16241e80163f8d (diff) | |
parent | f93b0a79de9ea56bea3e24797cc72625d9dcee3c (diff) | |
download | vcxsrv-68c12003597662f95eac07ddeee99637f7caa3e5.tar.gz vcxsrv-68c12003597662f95eac07ddeee99637f7caa3e5.tar.bz2 vcxsrv-68c12003597662f95eac07ddeee99637f7caa3e5.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver libxcb xcbproto mesa xkeyboard-config git update 27 Dec 2013
-rw-r--r-- | libxcb/NEWS | 2 | ||||
-rw-r--r-- | libxcb/configure.ac | 2 | ||||
-rw-r--r-- | libxcb/xcb-proto/NEWS | 2 | ||||
-rw-r--r-- | libxcb/xcb-proto/configure.ac | 2 | ||||
-rw-r--r-- | mesalib/scons/llvm.py | 2 | ||||
-rw-r--r-- | mesalib/src/mesa/state_tracker/st_atom_texture.c | 2 | ||||
-rw-r--r-- | xorg-server/configure.ac | 6 | ||||
-rw-r--r-- | xorg-server/present/present.c | 33 | ||||
-rw-r--r-- | xorg-server/xkeyboard-config/rules/base.extras.xml.in | 12 |
9 files changed, 41 insertions, 22 deletions
diff --git a/libxcb/NEWS b/libxcb/NEWS index d0198f59c..0152bcba6 100644 --- a/libxcb/NEWS +++ b/libxcb/NEWS @@ -1,4 +1,4 @@ -Release 1.10 (2013-12-XX) +Release 1.10 (2013-12-22) ========================= * Bump libxcb-xkb SONAME due to ABI break introduced in 1.9.2 * Enable libxcb-xkb by default diff --git a/libxcb/configure.ac b/libxcb/configure.ac index 294bd1a92..6d0f844b8 100644 --- a/libxcb/configure.ac +++ b/libxcb/configure.ac @@ -4,7 +4,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([libxcb], - 1.9, + 1.10, [xcb@lists.freedesktop.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/libxcb/xcb-proto/NEWS b/libxcb/xcb-proto/NEWS index 50ced6186..02727faf4 100644 --- a/libxcb/xcb-proto/NEWS +++ b/libxcb/xcb-proto/NEWS @@ -1,4 +1,4 @@ -Release 1.10 (2013-12-XX) +Release 1.10 (2013-12-22) ========================= * xkb: comment out portions that libxcb doesn't handle properly * Present: Remove reference to nonexistent enum diff --git a/libxcb/xcb-proto/configure.ac b/libxcb/xcb-proto/configure.ac index c82c8c749..a235f930c 100644 --- a/libxcb/xcb-proto/configure.ac +++ b/libxcb/xcb-proto/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.57) AC_INIT([XCB Proto], - 1.9, + 1.10, [xcb@lists.freedesktop.org]) AC_CONFIG_SRCDIR([xcb-proto.pc.in]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) diff --git a/mesalib/scons/llvm.py b/mesalib/scons/llvm.py index 8388d8e9f..6282cb538 100644 --- a/mesalib/scons/llvm.py +++ b/mesalib/scons/llvm.py @@ -202,6 +202,8 @@ def generate(env): env.ParseConfig('llvm-config --libs ' + ' '.join(components)) env.ParseConfig('llvm-config --ldflags') + if llvm_version >= distutils.version.LooseVersion('3.5'): + env.ParseConfig('llvm-config --system-libs') except OSError: print 'scons: llvm-config version %s failed' % llvm_version return diff --git a/mesalib/src/mesa/state_tracker/st_atom_texture.c b/mesalib/src/mesa/state_tracker/st_atom_texture.c index d79e04cf4..bd0a22dde 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_texture.c +++ b/mesalib/src/mesa/state_tracker/st_atom_texture.c @@ -255,7 +255,7 @@ update_single_texture(struct st_context *st, stObj->base.DepthMode) || (view_format != stObj->sampler_view->format) || stObj->base.BaseLevel != stObj->sampler_view->u.tex.first_level) { - pipe_sampler_view_reference(&stObj->sampler_view, NULL); + pipe_sampler_view_release(pipe, &stObj->sampler_view); } } diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac index 7ec19976b..8f823863d 100644 --- a/xorg-server/configure.ac +++ b/xorg-server/configure.ac @@ -26,9 +26,9 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.60) -AC_INIT([xorg-server], 1.14.99.905, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -RELEASE_DATE="2013-12-19" -RELEASE_NAME="Kraken" +AC_INIT([xorg-server], 1.15.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +RELEASE_DATE="2013-12-27" +RELEASE_NAME="Egg Nog" AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_USE_SYSTEM_EXTENSIONS diff --git a/xorg-server/present/present.c b/xorg-server/present/present.c index 96ca99241..638bfb965 100644 --- a/xorg-server/present/present.c +++ b/xorg-server/present/present.c @@ -525,6 +525,7 @@ present_execute(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_msc) WindowPtr window = vblank->window; ScreenPtr screen = window->drawable.pScreen; present_screen_priv_ptr screen_priv = present_screen_priv(screen); + uint8_t mode; if (vblank->wait_fence) { if (!present_fence_check_triggered(vblank->wait_fence)) { @@ -604,7 +605,20 @@ present_execute(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_msc) present_pixmap_idle(vblank->pixmap, vblank->window, vblank->serial, vblank->idle_fence); } - present_vblank_notify(vblank, vblank->kind, PresentCompleteModeCopy, ust, crtc_msc); + + /* Compute correct CompleteMode + */ + if (vblank->kind == PresentCompleteKindPixmap) { + if (vblank->pixmap && vblank->window) + mode = PresentCompleteModeCopy; + else + mode = PresentCompleteModeSkip; + } + else + mode = PresentCompleteModeCopy; + + + present_vblank_notify(vblank, vblank->kind, mode, ust, crtc_msc); present_vblank_destroy(vblank); } @@ -663,10 +677,18 @@ present_pixmap(WindowPtr window, if (crtc_msc >= target_msc) { if (divisor != 0) { target_msc = crtc_msc - (crtc_msc % divisor) + remainder; - if (target_msc <= crtc_msc) - target_msc += divisor; - } else + if (options & PresentOptionAsync) { + if (target_msc < crtc_msc) + target_msc += divisor; + } else { + if (target_msc <= crtc_msc) + target_msc += divisor; + } + } else { target_msc = crtc_msc; + if (!(options & PresentOptionAsync)) + target_msc++; + } } /* @@ -681,6 +703,9 @@ present_pixmap(WindowPtr window, if (!vblank->pixmap) continue; + if (!vblank->queued) + continue; + if (vblank->crtc != target_crtc || vblank->target_msc != target_msc) continue; diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in index aa47e3da0..dd3251b6e 100644 --- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in @@ -689,20 +689,12 @@ <variantList> <variant> <configItem> - <name>dvorak_a5</name> - <_description>Swedish (Dvorak A5)</_description> - </configItem> - </variant> - </variantList> - <variantList> - <variant> - <configItem> <name>sun_type6</name> <_description>Swedish (Sun Type 6/7)</_description> </configItem> </variant> - </variantList> - </layout> + </variantList> + </layout> <layout> <configItem> <name>ch</name> |