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 /mesalib | |
| 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
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); } } |