diff options
| author | marha <marha@users.sourceforge.net> | 2013-12-27 19:23:13 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-12-27 19:23:13 +0100 |
| commit | f93b0a79de9ea56bea3e24797cc72625d9dcee3c (patch) | |
| tree | b285d6cb87d2602e4f266f495ca8e5230e300a4c /mesalib | |
| parent | c81020559f329a516191927222b3698ba7370aca (diff) | |
| download | vcxsrv-f93b0a79de9ea56bea3e24797cc72625d9dcee3c.tar.gz vcxsrv-f93b0a79de9ea56bea3e24797cc72625d9dcee3c.tar.bz2 vcxsrv-f93b0a79de9ea56bea3e24797cc72625d9dcee3c.zip | |
xserver libxcb xcbproto mesa xkeyboard-config git update 27 Dec 2013
xserver commit 2ea973e12f5d954211e1d10085a4c74581b43aca
libxcb commit 010872f611a044ced4e96b18a7514796b2a443df
libxcb/xcb-proto commit 0d8f09b6469c45be08dae3665d352269ffcc7df2
xkeyboard-config commit 8f49a59f8cd118564ec1554d428177d681bc8b7f
mesa commit 597a7ccc720037f302fdd047e5b17b61655bf6ca
Diffstat (limited to 'mesalib')
| -rw-r--r-- | mesalib/scons/llvm.py | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_atom_texture.c | 2 |
2 files changed, 3 insertions, 1 deletions
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); } } |