Mesa (10.0): 26 new commits
Carl Worth
cworth at kemper.freedesktop.org
Tue Apr 15 19:42:47 UTC 2014
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=498853b9fdd21fad049f49d73002d5d7bac93092
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sun Mar 16 02:56:18 2014 +0000
glx: drop obsolete _XUnlock_Mutex in __glXInitialize error path
With commit 1f1928db001(glx: Drop _Xglobal_lock while we create and
initialize glx display) we've split the big _Xglobal_lock handling in
a more fine grained manner.
Unfortunatelly we forgot to drop the unlock_mutex on the error paths,
leading to undefined behaviour as the mutex is already unlocked.
Cc: Kristian Høgsberg <krh at bitplanet.net>
Cc: "9.2 10.0 10.1" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit f9832f960fa8edcee0eb6866698cc5f9f25bd8f9)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=45fd1d336a4fb156cb7a31f9f48bc844a9b338b1
Author: Brian Paul <brianp at vmware.com>
Date: Wed Apr 9 11:35:54 2014 -0600
svga: move LIST_INITHEAD(dirty_buffers) earlier in svga_context_create()
Fixes a crash in svga_context_flush_buffers() if we use the 'draw' module
for AA lines (when the device doesn't support that feature). We need to
initialize this list before we setup the swtnl pieces.
Found/fixed by Charmaine Lee.
Cc: "10.0" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Thomas Hellstrom <thellstrom at vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob at vmware.com>
(cherry picked from commit e853ade5441e8bf8f862ecf379c231cb439c5c00)
Conflicts:
src/gallium/drivers/svga/svga_context.c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cbaaf8fe42dce5ec39d77db3334b672dc745fa9c
Author: Courtney Goeltzenleuchter <courtney at lunarg.com>
Date: Tue Apr 8 09:10:09 2014 -0600
mesa: add bounds checking to eliminate buffer overrun
Decompressing ETC2 textures was causing intermitent segfault
by copying resulting 4x4 texel block to the destination texture
regardless of the size of the destination texture. Issue found
via application crash in GLBenchmark 3.0's Manhattan test.
v2: add more detail comment. Compute limit outside inner loops.
v3: add bugzilla reference
v4: Correct cc syntax in commit log
v5: really grab the right patch
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74988
Cc: "9.2 10.0 10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com> [v1, suggested v2-3]
(cherry picked from commit cb4ad1368551b64756c7b6e2007588e34739b188)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7b580a567f7637b87574a1432ea9f1a8b6a5ad1f
Author: Brian Paul <brianp at vmware.com>
Date: Thu Apr 3 08:45:42 2014 -0600
svga: replace sampler assertion with conditional
For TEX instructions, the set of samplers and sampler views should
be consistent. The XA state tracker sometimes passes an inconsistent
set of samplers and sampler views. Rather than assert and die, issue
a warning.
v2: add debugging code to detect inconsistent state.
v3: also check for null sampler in svga_state_tss.c
Cc: "10.0" "10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Thomas Hellstrom <thellstrom at vmware.com>
(cherry picked from commit 9bb2ec6fd1464d92f44b8aa693616edda9724312)
Conflicts:
src/gallium/drivers/svga/svga_state_fs.c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=69a777dd21bc04f99f5f9ebacec510300bc3d6de
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Mon Apr 7 08:42:59 2014 -0400
nouveau: fix firmware check on nvd7/nvd9
The kernel driver expects the class to be based on chipset generation
rather than VP generation. Make sure to pass 90b1 for NVDX chipsets
instead of 95b1.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77102
Fixes: 40dd777b33073
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.1 10.0" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst at ubunutu.com>
(cherry picked from commit 89c5b56be6c242d1489cf5c06b04c8b7a668d6f9)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=76f33938dd1cf5b8f70209f34c354c1babff7510
Author: Johannes Nixdorf <mixi at shadowice.org>
Date: Sat Mar 22 12:49:06 2014 +0100
configure.ac: fix the detection of expat with pkg-config
The pkg-config module was called "EXPAT" instead of "expat" in
PKG_CHECK_EXISTS. This seems to have been wrong because the wrong
argument was copied from PKG_CHECK_MODULES.
Cc: "10.0" "10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit 476db98e03a3f99af6658302974e51ec908fd274)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=68fef3983eafd90a6bf7b263f772a93100a6a7c1
Author: Brian Paul <brianp at vmware.com>
Date: Wed Apr 2 08:54:41 2014 -0600
cso: fix sampler view count in cso_set_sampler_views()
We want to call pipe->set_sampler_views() with count being the
maximum of the old number of sampler views and the new number.
This makes sure we null-out any old sampler views.
We already do the same thing for sampler states in single_sampler_done().
Fixes some assertions seen in the VMware driver with XA tracker.
Cc: "10.0" "10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Thomas Hellstrom <thellstrom at vmware.com>
Tested-by: Thomas Hellstrom <thellstrom at vmware.com>
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
(cherry picked from commit 2355a6441435b8e66a032c44f0794066338e30a3)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ab0f978b73d9c6ece2656d2447a6f0044200e46
Author: Brian Paul <brianp at vmware.com>
Date: Wed Mar 26 17:08:20 2014 -0600
mesa: fix glMultiDrawArrays inside a display list
The underlying glDrawArrays() calls weren't getting compiled into
the display list. We simply need to use the current dispatch table
so the CALL_DrawArrays() is routed to the display list save function.
This patch also fixes glMultiModeDrawArraysIBM and
glMultiModeDrawElementsIBM.
Fixes the new piglit gl-1.4-dlist-multidrawarrays test.
Cc: "10.0" "10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: José Fonseca <jfonseca at vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit e3418562940f7021b6d4d981666918964c84abb7)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9cd2daa0ef2af16e13379cb0adc0f46fa8bfb608
Author: Brian Paul <brianp at vmware.com>
Date: Mon Mar 24 17:17:34 2014 -0600
st/mesa: add null pointer checking in query object functions
Don't pass null query object pointers into gallium functions.
This avoids segfaulting in the VMware driver (and others?) if the
pipe_context::create_query() call fails and returns NULL.
Cc: "10.0" "10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
(cherry picked from commit 488d4c482637af4b0ab25a3b0e664795164fe819)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=15b25873346243b6bd3a9966db6f397d3abb814c
Author: Brian Paul <brianp at vmware.com>
Date: Sat Mar 22 11:23:32 2014 -0600
mesa: fix unpack_Z32_FLOAT_X24S8() / unpack_Z32_FLOAT() mix-up
And use the z32f_x24s8 helper struct in unpack_Z32_FLOAT_X24S8().
Cc: "10.0" "10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
(cherry picked from commit 1f4ebfaa889ba3c9ff2154459544984e45ae4714)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6cc6c921b12939738f9f50cd0088eadfa56abbde
Author: Christian König <christian.koenig at amd.com>
Date: Sun Mar 23 17:01:38 2014 +0100
st/mesa: fix sampler view handling with shared textures v4
Release the references to the sampler views before
destroying the pipe context.
v2: remove TODO and unrelated change
v3: move to st_texture.[ch], rename callback, add comment
v4: fix rebase mess up and add further cleanups
Signed-off-by: Christian König <christian.koenig at amd.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
Cc: "10.0 10.1" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit d117ddbe31fdbe79c871343358e2551593a1b18c)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=132df6a9a53ca375d118babed2506bb94168ccd2
Author: José Fonseca <jfonseca at vmware.com>
Date: Fri Mar 14 16:57:34 2014 +0000
draw: Duplicate TGSI tokens in draw_pipe_pstipple module.
As done in draw_pipe_aaline and draw_pipe_aapoint modules.
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
Reviewed-by: Zack Rusin <zackr at vmware.com>
Cc: "10.0 10.1" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit ee89432a4714b9da4508ed643db9fda39563de79)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0c37a0b94da66943e55b51f192405119c06471a0
Author: Christian König <christian.koenig at amd.com>
Date: Sat Mar 22 21:30:07 2014 +0100
st/mesa: recreate sampler view on context change v3
With shared glx contexts it is possible that a texture is create and used
in one context and then used in another one resulting in incorrect
sampler view usage.
v2: avoid template copy
v3: add XXX comment
Signed-off-by: Christian König <christian.koenig at amd.com>
Cc: "10.0 10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 92e543c45da4581b1940178a94e6f2d66c749367)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1184293f40569d1f3fa25c61d62d02c73260072f
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Mon Mar 17 10:37:12 2014 -0400
nouveau: there may not have been a texture if the fbo was incomplete
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Francisco Jerez <currojerez at riseup.net>
Cc: "10.0 10.1" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit e58071355e944138e01939df57f79affca24dec7)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2bd38301975359f9e4933166ad2816498bb262fd
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Thu Mar 13 10:36:25 2014 -0400
nouveau: add forgotten GL_COMPRESSED_INTENSITY to texture format list
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Francisco Jerez <currojerez at riseup.net>
Cc: "10.0 10.1" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit b676df9abf46bca84ab2f7c36dd5a556a1524966)
Conflicts:
src/mesa/drivers/dri/nouveau/nouveau_texture.c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f15356c70a9459696644e6ee698ce974b841a813
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Thu Mar 13 07:01:15 2014 -0400
mesa/main: condition GL_DEPTH_STENCIL on ARB_depth_texture
EXT_packed_depth_stencil is supported by all drivers, but
ARB_depth_texture isn't (notably nouveau_vieux). This should avoid
passing unexpected values down to ChooseTextureFormat.
The EXT_packed_depth_stencil spec does not make any explicit references
to requiring ARB_depth_texture in order to allow textures with that
format, however if there is no dependency, ARB_depth_texture would be
practically implied by the extension.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Francisco Jerez <currojerez at riseup.net>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: "10.0 10.1" <mesa-stable at lists.freedesktop.org>
Note for 10.0 backport: This will produce a conflict, the solution is to
move the surrounding if as well.
(cherry picked from commit 18690995a6c91c0cb4886815d78dc700a902b98b)
Conflicts:
src/mesa/main/teximage.c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=40a05673a70822deed6256b3d19d90fc58312949
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Thu Mar 13 06:35:52 2014 +0000
mesa: return v.value_int64 when the requested type is TYPE_INT64
Fixes "Operands don't affect result" defect reported by Coverity.
Cc: "9.2 10.0 10.1" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit a9cf3aa2087f807b15e0e59ad00dd5bacf362c18)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=437f291d64b52ee7cd1b69159af5aeeb684a80f0
Author: Jonathan Gray <jsg at jsg.id.au>
Date: Mon Mar 10 08:54:43 2014 -0600
gallium: add endian detection for OpenBSD
Cc: "10.0" "10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 40214267aba2f357eb3334eb8235504ccb93035a)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5c4f80dca62dc514b04d5553f8be2626e2d62b9e
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Thu Mar 6 00:51:48 2014 -0500
nv50: adjust blit_3d handling of ms output textures
This fixes some unwanted scaling when the output is multisampled.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Cc: "10.0 10.1" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 253314d4872ab4c4f01c0f1cd31ce4b71877ec30)
Also squashed in the following:
Revert nvc0 part of "nv50: adjust blit_3d handling of ms output textures"
The nvc0 bits don't appear to work, and I thought I had removed them
from the commit. Oops.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.0 10.1" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 897f40f25d21af678b1b67c1a68c4a6722d19983)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=860ee224804a026d9533ea22c41de2c16d2a425a
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Wed Mar 5 22:25:55 2014 -0500
nouveau: fix fence waiting logic in screen destroy
nouveau_fence_wait has the expectation that an external entity is
holding onto the fence being waited on, not that it is merely held onto
by the current pointer. Fixes a use-after-free in nouveau_fence_wait
when used on the screen's current fence.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75279
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Cc: "9.2 10.0 10.1" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 507f0230d4ca2238c818006499e21abb4c133203)
Conflicts:
src/gallium/drivers/nouveau/nv30/nv30_screen.c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ad6062ee67bc3333d29de8ce2680a5a6d37a42b
Author: Matt Turner <mattst88 at gmail.com>
Date: Tue Mar 4 21:11:38 2014 -0800
mesa: Wrap SSE4.1 code in #ifdef __SSE4_1__.
Because people insist on doing things like explicitly disabling SSE 4.1.
Cc: "10.0 10.1" <mesa-stable at lists.freedesktop.org>
Tested-by: David Heidelberger <david.heidelberger at ixit.cz>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71547
(cherry picked from commit 8d3f739383fbdf671752fdec707f1c2b9b2aa6a3)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=063f9c6aef549beb2a3524351b4ba3b0a540be48
Author: Brian Paul <brianp at vmware.com>
Date: Thu Mar 6 11:24:33 2014 -0700
mesa: fix copy & paste bugs in pack_ubyte_SRGB8()
Cc: "10.0" "10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
(cherry picked from commit 1e25aa4cdb3bb1f190ea3905eb1d169e0c5a1ef0)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6490bdf358b958e7333ed740e7746b963a6bcdca
Author: Brian Paul <brianp at vmware.com>
Date: Thu Mar 6 10:58:30 2014 -0700
mesa: fix copy & paste bugs in pack_ubyte_SARGB8()
Cc: "10.0" "10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
(cherry picked from commit 9493fc729e35e36c1840957b4af40338e69236a5)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1062066fadc6c2851460d08730fb02d447cc3deb
Author: Carl Worth <cworth at cworth.org>
Date: Mon Apr 14 14:25:32 2014 -0700
Ignore patches which don't apply.
These patches all fix bugs in code that in not present in the 10.0 branch.
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fd5f0644afc59af1b4013424917de5ae097f65a3
Author: Brian Paul <brianp at vmware.com>
Date: Fri Feb 28 07:55:04 2014 -0700
mesa: add unpacking code for MESA_FORMAT_Z32_FLOAT_S8X24_UINT
Fixes glGetTexImage() when converting from MESA_FORMAT_Z32_FLOAT_S8X24_UINT
to GL_UNSIGNED_INT_24_8. Hit by the piglit
ext_packed_depth_stencil-getteximage test.
Cc: "10.0" "10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit a12d4d0398c437911720069d293b469c60c4488c)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ef793cbf6dcfb74f2cc3bebb875468f24445abb2
Author: Alex Deucher <alexander.deucher at amd.com>
Date: Wed Feb 12 12:00:17 2014 -0500
radeon: reverse DBG_NO_HYPERZ logic
Change the flag to DBG_HYPERZ and reverse the logic
so setting the flag enabled the feature. This disables
hyperz on r600g and radeonsi by default. It can be
enabled by setting the env var. There are just too
many issues with certain apps so leave it disabled for
now until we sort out the issues with the problematic
apps.
Bugs:
https://bugs.freedesktop.org/show_bug.cgi?id=58660
https://bugs.freedesktop.org/show_bug.cgi?id=64471
https://bugs.freedesktop.org/show_bug.cgi?id=66352
https://bugs.freedesktop.org/show_bug.cgi?id=68799
https://bugs.freedesktop.org/show_bug.cgi?id=72685
https://bugs.freedesktop.org/show_bug.cgi?id=73088
https://bugs.freedesktop.org/show_bug.cgi?id=74428
https://bugs.freedesktop.org/show_bug.cgi?id=74803
https://bugs.freedesktop.org/show_bug.cgi?id=74863
https://bugs.freedesktop.org/show_bug.cgi?id=74892
https://bugzilla.kernel.org/show_bug.cgi?id=70411
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
Cc: "10.1" "10.0" <mesa-stable at lists.freedesktop.org>
Acked-by: Marek Olšák <marek.olsak at amd.com>
(cherry picked from commit 01e637114914453451becc0dc8afe60faff48d84)
More information about the mesa-commit
mailing list