Mesa (10.1): 62 new commits
Carl Worth
cworth at kemper.freedesktop.org
Mon Apr 14 19:03:10 UTC 2014
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0c6be6e146c094da7f3172be91f3565a9ec6a308
Author: Marek Olšák <marek.olsak at amd.com>
Date: Mon Mar 3 02:20:45 2014 +0100
r600g: implement edge flags
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
(cherry picked from commit 1337da51152db7fa1a71ac86b61b51a42d29d595)
Conflicts:
src/gallium/drivers/r600/evergreen_state.c
src/gallium/drivers/r600/r600_shader.c
src/gallium/drivers/r600/r600_shader.h
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=30be758fd29ef56e319e7956e0af23b586ab2ce6
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Wed Apr 9 15:38:21 2014 +0900
r600g: Don't leak bytecode on shader compile failure
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74868
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
(cherry picked from commit ee2bcf38a4c8930d8f9cecfac580030a45c41dae)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=aae5cf54a243d31e898078711ad8659e38986f71
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=c5612ba549507d239d00335cd0961d7a269b5a85
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=e52117cefb367aa1caa9159c1a28abeafb3b0f2c
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Tue Apr 8 13:25:27 2014 -0700
i965: Stop advertising GL_MESA_ycbcr_texture.
The "new" fragment shader backend has never supported the necessary
color conversion code for this to work. We began using the new backend
in Mesa 7.10 for GLSL (commit a81d423d93f22a948f3aa4bf73, October 2010),
and for ARB_fragment_program in Mesa 9.1 (commit 97615b2d8c7c3cea6fd3a4,
August 2012).
I haven't heard any complaints, so I don't think anyone will miss this
feature. I believe mplayer used it at one point, but these days
defaults to other paths anyway.
Cc: mesa-stable at lists.freedesktop.org
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <idr at freedesktop.org>
Reviewed-by: Eric Anholt <eric at anholt.net>
(cherry picked from commit 26ae030fcc364a4cfcdec0cbac2ca87d096c6cd0)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=18055f913609167a140c6af276d31e1f75b0cac6
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=563fd9d736f39062be7a5a830fda6ef6e2eb18dd
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)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9aa0b296f8fcc8828917877be69361a2c3545805
Author: Chia-I Wu <olv at lunarg.com>
Date: Mon Apr 7 12:31:14 2014 +0800
i965/vec4: fix record clearing in copy propagation
Given
mov vgrf7, vgrf9.xyxz
add vgrf9.xyz, vgrf4.xyzw, vgrf5.xyzw
add vgrf10.x, vgrf6.xyzw, vgrf7.wwww
the last instruction would be wrongly changed to
add vgrf10.x, vgrf6.xyzw, vgrf9.zzzz
during copy propagation.
The issue is that when deciding if a record should be cleared, the old code
checked for
inst->dst.writemask & (1 << ch)
instead of
inst->dst.writemask & (1 << BRW_GET_SWZ(src->swizzle, ch))
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76749
Signed-off-by: Chia-I Wu <olv at lunarg.com>
Cc: Jordan Justen <jljusten at gmail.com>
Cc: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Ian Romainck <ian.d.romanick at intel.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Cc: "10.1" <mesa-stable at freedesktop.org>
(cherry picked from commit 4ddf51db6af36736d5d42c1043eeea86e47459ce)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=82db52a55e73801f9a1c9620e885738629ce5b31
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Sun Apr 6 22:41:34 2014 -0700
glsl: Fix lack of i2u in lower_ubo_reference.
ir_binop_ubo_load takes unsigned integer operands. However, the array
index used to compute these offsets may be a signed integer. (For
example, see Piglit's spec/glsl-1.40/uniform_buffer/fs-bvec-array).
For some reason, we were missing an ir_binop_i2u cast, and ir_validator
was failing to catch that.
Without this change, ir_builder's type inference code broke for me when
writing a new optimization pass.
Cc: mesa-stable at lists.freedesktop.org
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
(cherry picked from commit e14b93371cc8394bd69622f6b60cfdf8ba177360)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8f4fb58dbfc5c55e3732785256076a2c429a845b
Author: Thomas Hellstrom <thellstrom at vmware.com>
Date: Mon Apr 7 13:42:25 2014 -0700
st/xa: Make sure unused samplers are set to NULL
renderer_copy_prepare was setting the first sampler but never telling
the cso code how many samplers were actually used. Fix this.
Cc: "10.1" <mesa-stable at freedesktop.org>
Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 47f60cbb7197bd9f8bb27ca3a2b160e8a563619a)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8f85bf57fce7e63589c5862211eb66be4923e717
Author: Thomas Hellstrom <thellstrom at vmware.com>
Date: Mon Apr 7 02:37:39 2014 -0700
st/xa: Bind destination before setting new state
Binding a new destination may cause the svga driver to emit draw calls
while propagating the surface. Make sure this doesn't happen in the middle
of sampler state setup where state may be incosistent.
In practice, surface propagation should never happen here and even if it did,
it wouldn't be a valid reason for the svga driver to emit partially set up
state, but to avoid future uncertainties, make sure this doesn't happen
anyway.
Found while auditing the state tracker for inconsistent sampler state /
sampler view setup.
Cc: "10.1" <mesa-stable at freedesktop.org>
Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob at vmware.com>
(cherry picked from commit e5d2c5b89944007d69347fd419789312be573d0c)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=76c84a0f75743358148e2140a5e3a2b585769ceb
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=b38c141850e7a527879312622924fec8040e3b8a
Author: Thomas Hellstrom <thellstrom at vmware.com>
Date: Mon Apr 7 00:56:42 2014 -0700
winsys/svga: Fix prime surface references also for guest-backed surfaces
Implement guest-backed surface sharing using prime fds. Previously only
legacy surfaces could use this functionality. Also use the vmwgfx 2.6
single-ioctl prime fd reference if available.
Cc: "10.1" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
(cherry picked from commit 2f6fcd65f2401695427bcbf1f2bd428d466ecda0)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b088d4649c14e8b63be923a2f9669d75e8292e4b
Author: Thomas Hellstrom <thellstrom at vmware.com>
Date: Sun Apr 6 23:33:19 2014 -0700
winsys/svga: Update the vmwgfx_drm.h header to latest version from kernel
Cc: "10.1" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
(cherry picked from commit 0887b499e95b0103fa01614cbc9988f0b15c75d6)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8d6eea9824564547140e5799e72f37d5de9ac7ca
Author: Jonathan Gray <jsg at jsg.id.au>
Date: Sun Mar 23 15:53:07 2014 +1100
egl/dri2: don't require libudev to build drm/wayland platforms
After the loader changes libudev is no longer required to
build gbm or the egl drm/wayland platforms.
Remove a libudev ifdef which allows the the drm egl driver
to be loaded on OpenBSD.
Signed-off-by: Jonathan Gray <jsg at jsg.id.au>
Cc: "10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit 0295953c5de6a4b2394530235ca1d61cf16f4e8c)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=91543aef3b7530cb348197f9cda3f5046f67da51
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=4d7504c0c48dab4b345fc2d08afee56056ba95d0
Author: Jonathan Gray <jsg at jsg.id.au>
Date: Wed Mar 19 01:59:18 2014 +1100
megadriver_stub.c: don't use _GNU_SOURCE to gate the compat code
_GNU_SOURCE is only set/required for linux*|*-gnu*|gnu*) and as the
functionality is available on other systems check for RTLD_DEFAULT instead.
Signed-off-by: Jonathan Gray <jsg at jsg.id.au>
Cc: "10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit 1cc742d912b76b2cbf97a5a44f271b4f41037bec)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d7df21d08b06f57c8fdb9798d66e1ed7c644ff02
Author: Jonathan Gray <jsg at jsg.id.au>
Date: Wed Mar 19 01:59:16 2014 +1100
loader: don't limit the non-udev path to only android
Platforms that lack libudev (OpenBSD and possibly others) need
this change in order to load the correct dri driver.
Under linux we unconditionally require libudev, thus this code
will never get build.
v2: Add commit message (Emil Velikov)
Signed-off-by: Jonathan Gray <jsg at jsg.id.au>
Cc: "10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit 380f05ccc305bad7568ce19ea7e27cae39998d08)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b853dceb4bcfc0ae3d814c1599e969a6ccde7636
Author: Jonathan Gray <jsg at jsg.id.au>
Date: Wed Mar 19 01:59:15 2014 +1100
loader: use 0 instead of FALSE which isn't defined
Signed-off-by: Jonathan Gray <jsg at jsg.id.au>
Cc: "10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit 727f54a76e03d61462914862d3111afe798547f5)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=71c4e4f42038ed098a93c62acad5aa368dc62c93
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=95bba6939876539cb9c9626a4a5b20faa0d4c261
Author: Thomas Hellstrom <thellstrom at vmware.com>
Date: Mon Mar 31 09:01:24 2014 +0200
winsys/svga: Replace the query mm buffer pool with a slab pool v3
This is to avoid running out of query buffer space due to winsys
limitations. Instead of a fixed size per screen pool of query buffers,
use a slab allocator that allocates a new slab if we run out of space
in the first one.
v2: Correct email addresses.
v3: s/8192/VMW_QUERY_POOL_SIZE/. Improve documentation and log message.
Reported-and-tested-by: Brian Paul <brianp at vmware.com>
Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
Cc: "10.1" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 5dc206525b6ff799870f880469a985f3d944eb77)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e144e14c0ac433a7c3c3ae34d97a106e0c183413
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Fri Mar 21 18:09:36 2014 +0000
configure: enable dri3 only for linux
Currently only linux can make use of dri3, so it would make sense to
enable it explicitly for the platform.
Drop a duplicated libudev check while we're at it.
v3: Properly handle dri3 and reword commit message.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76377
Cc: "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>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
(cherry picked from commit 23740ed031f4a5fb308e03a4d239ab3db31fffd9)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c1fbfa485970b75e89bc973cf9015859b9430ae8
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=2ea18474a6e8099691b6df339a65b2c6b9de3486
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=740bd738a91ca71ec4d4930180e82516b62842aa
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=e801b8d67704c5ca2c8aaa08d9ab5913acb70277
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=da726d3d930401bcf708141c68a03ae5def99a63
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=1d32349f7015e1b7000436e76d07696648d701e4
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=b3c9041ccaf00c558237652e1ceae2b984b23e9a
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Thu Mar 20 17:37:00 2014 -0400
nvc0/ir: move sample id to second source arg to fix sampler2DMS
The nvc0 texfetch instruction expects the sample id to be in the second
source (usually used for the offset) rather than as part of the texture
coordinate.
This fixes all the sampler2DMS/Array tests on nvc0.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Cc: "10.1" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 19ba573a57ff6125a26ff9ae94cf43c36129645f)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=66191588737582ba66a91e91daa043ef5f9ab7d0
Author: Marek Olšák <marek.olsak at amd.com>
Date: Mon Mar 10 16:27:21 2014 +0100
st/mesa: drop the lowering of quad strips to triangle strips
This fallback to triangle strips is silly and should be done in drivers
if they need it.
This should fix the case when quad strips are used with flatshading that is
enabled by the "flat" GLSL varying modifier. It also fixes primitive restart
for quad strips.
This fixes piglit:
NV_primitive_restart/primitive-restart-draw-mode-quad_strip
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit e5f6b6d0feb9b9ad7132d5f236959ef088237347)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6466e99aa012229615a70656372fb1d65aedd8d3
Author: Marek Olšák <marek.olsak at amd.com>
Date: Tue Mar 11 14:52:39 2014 +0100
st/mesa: fix generating mipmaps for cube arrays
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit db722bdcab15717d80797323330b60fe3f61df5d)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f5fe91c087962e2c0e8e2cf1926c5f4deba0b759
Author: Marek Olšák <marek.olsak at amd.com>
Date: Wed Mar 12 02:04:03 2014 +0100
mesa: fix software fallback for generating mipmaps for 3D textures
It didn't use the driver-provided src/dstRowStride at all.
This was broken for the cases when stride != width*bpp.
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 91df26842fb36e6f1ec33db5c028ae34c9993f1d)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb89da2e6196cf42d0d180a6a6a07c49325e3f45
Author: Marek Olšák <marek.olsak at amd.com>
Date: Tue Mar 11 15:04:33 2014 +0100
mesa: fix software fallback for generating mipmaps for cube arrays
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 78c60d1b630c2c21dd987ea1bb3713802f22cd29)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1dba98578822a549d196505a78563ff34a919afc
Author: Marek Olšák <marek.olsak at amd.com>
Date: Tue Mar 11 15:04:00 2014 +0100
mesa: allow generating mipmaps for cube arrays
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 185ad78ffddb06d7f1d666ae508cf2fb79712e59)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3a4a0882cbf08b59672fed394e517f00059b5fb4
Author: Marek Olšák <marek.olsak at amd.com>
Date: Tue Mar 11 15:02:39 2014 +0100
mesa: fix texture border handling for cube arrays
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 55cf320ed87f902d817dfea363e6612be0c3b675)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=352b9e8faf5160d6e7fa272aa52fc7f28883542a
Author: Brian Paul <brianp at vmware.com>
Date: Tue Mar 18 17:25:07 2014 -0600
c11/threads: don't include assert.h if the assert macro is already defined
In the gallium code, the assert() macro could come from either the
system's assert.h file (via c11/threads.h) or from gallium's u_debug.h.
It looks like all known assert.h files unconditionally #undef assert
before defining their own version. So the assert you get depends on
whether threads.h or u_debug.h was included last.
In the gallium code we really want to use the assert() from u_debug.h
(it behaves better on Windows). In gallium, c11/threads.h is only
included after u_debug.h in the os_thread.h wrapper. So Adding
an #ifndef assert test in the threads*.h files avoids using the system's
assert().
Cc: "10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: José Fonseca <jfonseca at vmware.com>
(cherry picked from commit eaf9affa5ec9c5fd919e4207ab80b4677650ac67)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=87587c6683e255ad9773d1bc3db45959c1c38e64
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=ee71a08f23a0f197d55fd460c281883b0ac1a7a9
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)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9cb82a0319f14813832a7d3edf58d49f2fc4230f
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)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec6be857f3774499f851e0fe2c99584ca9867045
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Mon Mar 17 14:42:12 2014 -0400
loader: add special logic to distinguish nouveau from nouveau_vieux
There are a lot of different pci ids supported by nouveau, and more are
added all the time. The relevant distinguisher between drivers is the
chipset id.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Cc: "10.1" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 51989817e6767d8ef469708c69d7ce38b87e9b6e)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=365975e5eb068d861a078ecdf376ee3959fde10d
Author: Marek Olšák <marek.olsak at amd.com>
Date: Sun Mar 9 14:18:45 2014 +0100
mesa: mark GL_RGB9_E5 as not color-renderable
The GL 4.4 spec says it's not color-renderable and not accepted
by RenderBufferStorage. The EXT_texture_shared_exponent spec says
it's not color-renderable but it's accepted by RenderBufferStorageEXT.
This seems to be a bug in the extension spec.
Let's do what GL 4.4 says.
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit 2e361160ffff036fa65f6ca8ee2490b3b193ff3d)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3b7fd0351d029ec0d5757fcade8696766c184f1b
Author: Marek Olšák <marek.olsak at amd.com>
Date: Mon Mar 3 01:04:22 2014 +0100
st/mesa: fix per-vertex edge flags and GLSL support (v2)
This fixes piglit/gl-2.0-edgeflag.
v2: use StrideB to recognize per-vertex edge flags
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit 3d42696d10377bc8fcad06eac3be2ec291490545)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=676cc8e39d2ca4b6e3fcdf220cf0e1ac7c088b66
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Tue Mar 11 17:11:36 2014 -0700
i965/fs: Fix register comparisons in saturate propagation.
opt_saturate_propagation_local compares scan_inst->dst.reg/reg_offset
with inst->src[0].reg/reg_offset, and ensures that scan_inst->dst.file
is GRF. But nothing ensured that inst->src[0].file was GRF.
In the following program, this resulted in u1:F matching vgrf1:UW,
and a saturate being incorrectly propagated from instruction 8 to
instruction 1.
{ 1} 0: add vgrf0:UW, hw_reg1+8:UW, hw_reg0:V
{ 1} 1: add vgrf1:UW, hw_reg1+10:UW, hw_reg0:V
{ 1} 2: linterp vgrf6:F, hw_reg2:F, hw_reg3:F, hw_reg0:F
{ 2} 3: linterp vgrf27:F, hw_reg2:F, hw_reg3:F, hw_reg0+16:F
{ 4} 4: mov vgrf10+0.0:F, vgrf6:F
{ 3} 5: mov vgrf10+1.0:F, vgrf27:F
{ 6} 6: tex vgrf8+0.0:F, vgrf10+0.0:F
{ 5} 7: mov vgrf32:F, u1:F
{ 5} 8: mov.sat vgrf12:F, u1:F
From shader-db:
total instructions in shared programs: 1841932 -> 1841957 (0.00%)
instructions in affected programs: 5823 -> 5848 (0.43%)
I inspected two of the 25 hurt shaders, and concluded that they were
both hitting this bug, and not legitimately optimized.
This fixes bugs in Left 4 Dead 2 and Team Fortress 2, possibly among
others. The optimization pass didn't exist in 10.0, so this is only
a candidate for 10.1.
Cc: "10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit 4d2e79269a97c403a6384e0f5164b9f54b6a5f61)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c2c1c902f9793090905667227436442f09983c2d
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=d78131f695d80f2f0ceb793c00d1299eff626d8d
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Wed Mar 12 16:22:15 2014 +0000
nv50: add missing brackets when handling the samplers array
Commit 3805a864b1d(nv50: assert before trying to out-of-bounds access
samplers) introduced a series of asserts as a precausion of a previous
illegal memory access.
Although it failed to encapsulate loop within nv50_sampler_state_delete
effectively failing to clear the sampler state, apart from exadurating
the illegal memory access issue.
Fixes gcc warning "array subscript is above array bounds" and
"Nesting level does not match indentation" and "Out-of-bounds read"
defects reported by Coverity.
Cc: "10.1" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
(cherry picked from commit c26b488088a459be26cfdb0b134fb058aa4c0411)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8648c2b2a0fefafcb8b3910e5fb2a3365b702838
Author: Marek Olšák <marek.olsak at amd.com>
Date: Sun Mar 9 20:03:57 2014 +0100
r600g,radeonsi: fix MAX_TEXTURE_3D_LEVELS and MAX_TEXTURE_ARRAY_LAYERS limits
CB_COLORi_VIEW.SLICE_MAX can be at most 2047.
This fixes the maxlayers piglit test.
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
(cherry picked from commit 4f1f32306a5238507af44dde0e3a53820b896930)
Conflicts:
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/radeonsi/si_pipe.c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9bfe1b3773df91788903b4e1295365fd20f180c6
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=a77c10a1a46512b7b6ecaf60e4b1385245e8e750
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)
And squashed with:
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=ac14d741ee25ae13ab6271b5181c1e415164695f
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=acfb3f7f0266fd11d95931ef284a365c0fda424d
Author: Marek Olšák <marek.olsak at amd.com>
Date: Mon Mar 3 01:01:05 2014 +0100
mesa: fix the format of glEdgeFlagPointer
Softpipe expects a float in the vertex shader, which is what glEdgeFlag
generates.
This fixes piglit/gl-2.0-edgeflag.
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit 780ce576bb1781f027797039693b98253ee4813e)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=228ad18b84f780e35efb637424ff9ca4fcbfb8c3
Author: Marek Olšák <marek.olsak at amd.com>
Date: Mon Mar 3 22:53:58 2014 +0100
r600g: fix blitting the last 2 mipmap levels for Evergreen
This fixes a lot of compressedteximage piglit tests.
R600-R700 don't have this issue.
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit fcdf6fa86cb4dc530b8ab6881faa1da1aafa2b81)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c09f4bb448e24ec379442780a3c35857bf815a5
Author: Marek Olšák <marek.olsak at amd.com>
Date: Mon Mar 3 18:29:39 2014 +0100
r600g: fix texelFetchOffset GLSL functions
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit 8a08051e2a7227061300e344a4e41a1cdf2d6145)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3eb2103ce0031e8326550134de8045be0a8d361f
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=58fe564607ea0a8fe95f0486c6cabde1efa099fa
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=16fc050e072a99f48ef8f258d84e7f6d9bf95482
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=248d82515f3fb816e8fdc63afd3dbdffc57ca2c0
Author: Aaron Watry <awatry at gmail.com>
Date: Tue Mar 4 17:12:19 2014 -0600
gallium/util: Fix memory leak
Fix a leaked vertex shader in u_blitter.c
Signed-off-by: Aaron Watry <awatry at gmail.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
CC: "10.1" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit fb781526787463cb4a1c596b6f8ed867d24b87a2)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=728f58c5349fc76a310e95d83e7216d529c2a73e
Author: Anuj Phogat <anuj.phogat at gmail.com>
Date: Mon Mar 3 14:40:14 2014 -0800
mesa: Allow GL_DEPTH_COMPONENT and GL_DEPTH_STENCIL combinations in glTexImage{123}D()
From OpenGL 3.3 spec, page 141:
"Textures with a base internal format of DEPTH_COMPONENT or DEPTH_STENCIL
require either depth component data or depth/stencil component data.
Textures with other base internal formats require RGBA component data.
The error INVALID_OPERATION is generated if one of the base internal
format and format is DEPTH_COMPONENT or DEPTH_STENCIL, and the other
is neither of these values."
Fixes Khronos OpenGL CTS test failure: proxy_textures_invalid_size
Cc: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 079bff5a99fa19029fc0caba92fe57046ee29b23)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=df15372b65fe7cc1e1247e9d5249e85f7c7ee83a
Author: Anuj Phogat <anuj.phogat at gmail.com>
Date: Fri Feb 21 16:58:07 2014 -0800
mesa: Set initial internal format of a texture to GL_RGBA
From OpenGL 4.0 spec, page 398:
"The initial internal format of a texel array is RGBA
instead of 1. TEXTURE_COMPONENTS is deprecated; always
use TEXTURE_INTERNAL_FORMAT."
Fixes Khronos OpenGL CTS test failure: proxy_textures_invalid_size
Cc: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 063980151e801fca6c314e14c82e9a7b8c04a4d2)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=50d65b4374b070719fb00963ea622e1074cd261e
Author: Brian Paul <brianp at vmware.com>
Date: Sat Mar 1 11:16:27 2014 -0700
st/osmesa: check buffer size when searching for buffers
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75543
Cc: "10.1" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit cbacee207faf866b0444beb583d3d6f341a8ee78)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f4e348d008b3753a43493e8044c1c1747c50aa06
Author: José Fonseca <jfonseca at vmware.com>
Date: Mon Mar 3 15:06:19 2014 +0000
c11/threads: Don't implement thrd_current on Windows.
GetCurrentThread() returns a pseudo-handle (a constant which only makes
sense when used within the calling thread) and not a real handle.
DuplicateHandle() will return a real handle, but it will create a new
handle every time we call. Calling DuplicateHandle() here means we will
leak handles, which can cause serious problems.
In short, the Windows implementation of thrd_t needs a thorough make
over, and it won't be pretty. It looks like C11 committee
over-simplified things: it would be much better to have seperate objects
for threads and thread IDs like C++11 does.
For now, just comment out the thrd_current() implementation, so we get
build errors if anybody tries to use it.
Thanks to Brian Paul for spotting and diagnosing this problem.
Cc: "10.0" "10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit a61d859519d520b849c11ad5c1c1972870abd956)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=34e8881ac75348cdc070e9a873ee3e5a856c19f7
Author: José Fonseca <jfonseca at vmware.com>
Date: Mon Mar 3 14:55:41 2014 +0000
mapi/u_thread: Use GetCurrentThreadId
u_thread_self() expects thrd_current() to return a unique numeric ID
for the current thread, but this is not feasible on Windows.
Cc: "10.0" "10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit e8d85034dad37177fce780ee3e09501e60be6e81)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=30274cf36c5f578ff1a38027a1dc1017e49cafb8
Author: José Fonseca <jfonseca at vmware.com>
Date: Mon Mar 3 14:53:30 2014 +0000
c11/threads: Fix nano to milisecond conversion.
Per https://gist.github.com/yohhoy/2223710/#comment-710118
Cc: "10.0" "10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Michel Dänzer <michel at daenzer.net>
(cherry picked from commit f34d75d6f69f4c0bf391e0adf1fd469601b01b04)
More information about the mesa-commit
mailing list