Mesa (17.0): 38 new commits
Andres Gomez
tanty at kemper.freedesktop.org
Wed Apr 26 22:31:41 UTC 2017
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b7916134a0102218d6b4ec0d482bfd0e3aeeba43
Author: Timothy Arceri <tarceri at itsqueeze.com>
Date: Fri Apr 21 17:04:10 2017 +1000
mesa: validate sampler type across the whole program
Currently we were only making sure types were the same within a
single stage. This looks to have regressed with 953a0af8e3f73.
Fixes: 953a0af8e3f73 ("mesa: validate sampler uniforms during gluniform calls")
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
https://bugs.freedesktop.org/show_bug.cgi?id=97524
(cherry picked from commit d682f8aa8e0edd166166f87fcd774dd2d57b4180)
[Andres Gomez: there was an intermediate cleanup but this commit
basically brings everything that was missing back]
Signed-off-by: Andres Gomez <agomez at igalia.com>
Conflicts:
src/mesa/main/uniforms.c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e98c9af5598038dc8eaef6f654c9e1f752a83a35
Author: Emil Velikov <emil.velikov at collabora.com>
Date: Sun Apr 16 15:46:28 2017 +0100
st/mesa: automake: honour the vdpau header install location
If VDPAU is installed in the non-default location, we'll fail to find
the headers and error at build time.
../../src/gallium/include/state_tracker/vdpau_dmabuf.h:37:25: fatal error: vdpau/vdpau.h: No such file or directory
#include <vdpau/vdpau.h>
^
Fixes: faba96bc60b ("st/vdpau: add new interop interface")
Cc: Christian König <christian.koenig at amd.com>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
(cherry picked from commit 51c0c213b7fa53b249e9fcb9004a3ba1076fe773)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8d7a8711d4e0723e1996058d1a6251053ffd44a2
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sun Apr 16 01:46:59 2017 +0100
configure.ac: check require_basic_egl only if egl enabled
Fixes: 1ac40173c2a ("configure.ac: simplify EGL requirements for drivers dependent on EGL")
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
(cherry picked from commit 4516bfbd309a6996c18f577de47b13e33dce0828)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=795287c66e0c4d73c649e85f9c41bd9521ee20be
Author: Grazvydas Ignotas <notasas at gmail.com>
Date: Fri Apr 14 20:00:26 2017 +0300
radv: report timestampPeriod correctly
The kernel returns frequency in kHz, so to convert to nanosecond
interval that Vulkan uses the dividend should be 1000000.0 and not
100000.0.
This fixes the GPU graph in DOOM and matches the amdgpu-pro blob.
Fixes: f4e499ec791 "radv: add initial non-conformant radv vulkan driver"
Signed-off-by: Grazvydas Ignotas <notasas at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
(cherry picked from commit 1b2fe7ce45a508fa080e6bf93b820e6217beed83)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=375cc332bbcdbb088ce2dafab1321622ea0314a9
Author: Andres Gomez <agomez at igalia.com>
Date: Wed Apr 26 00:25:39 2017 +0300
cherry-ignore: provide required gem stubs for the tests
Only reported because it referes to fixes in 2 commits, but they are
not in stable.
Signed-off-by: Andres Gomez <agomez at igalia.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ce03b2c40ec6ab7bbb5d034e7e93d469d42a8d99
Author: Andres Gomez <agomez at igalia.com>
Date: Wed Apr 26 00:23:58 2017 +0300
cherry-ignore: automake: ensure that the destination directory is created
Only reported because it referes to fixes in 2 commits, but they are
not in stable.
Signed-off-by: Andres Gomez <agomez at igalia.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ccdae185e8225f43ece91393893b8692d7e4597e
Author: Andres Gomez <agomez at igalia.com>
Date: Wed Apr 26 00:22:21 2017 +0300
cherry-ignore: remove i965_symbols_test reference from .gitignore
It just cleans .gitignore.
Signed-off-by: Andres Gomez <agomez at igalia.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7020d316c03cca6a776ac023e3aefcbfc2a7ba70
Author: Andres Gomez <agomez at igalia.com>
Date: Wed Apr 26 00:20:37 2017 +0300
cherry-ignore: remove dead brw_new_shader() declaration
Removes unused symbols but it doesn't really add nor fix anything
relevant.
Signed-off-by: Andres Gomez <agomez at igalia.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b2a9b5c5d564a98faa71391dcc814ea28edf6e89
Author: Andres Gomez <agomez at igalia.com>
Date: Wed Apr 26 00:19:12 2017 +0300
cherry-ignore: r600: fix libmesa_amd_common dependency
Only reported because it referes to fixes in 2 commits, but they are
not in stable.
Signed-off-by: Andres Gomez <agomez at igalia.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=82082aea427e8eb54ce2738285e72ea9b9d06a03
Author: Andres Gomez <agomez at igalia.com>
Date: Wed Apr 26 00:17:08 2017 +0300
cherry-ignore: vulkan: add support for libmesa_vulkan_util
Only reported because it referes to fixes in 2 commits, but they are
not in stable.
Signed-off-by: Andres Gomez <agomez at igalia.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f3a44a736cb3e75fdfe775d171f9cc83c41950f
Author: Andres Gomez <agomez at igalia.com>
Date: Wed Apr 26 00:14:05 2017 +0300
cherry-ignore: make radv_resolve_entrypoint static
It just makes a local function static.
Signed-off-by: Andres Gomez <agomez at igalia.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2b4d42bb26385acd502eb686cd84d3d6457a6329
Author: Andres Gomez <agomez at igalia.com>
Date: Wed Apr 26 00:11:27 2017 +0300
cherry-ignore: remove unused radv_dispatch_table dtable
Removes unused symbols but it doesn't really add nor fix anything
relevant.
Signed-off-by: Andres Gomez <agomez at igalia.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=270898aba9f4f55f3578ed7edeed58fae6966436
Author: Andres Gomez <agomez at igalia.com>
Date: Wed Apr 26 00:03:12 2017 +0300
cherry-ignore: remove unused anv_dispatch_table dtable
Removes unused symbols but it doesn't really add nor fix anything
relevant.
Signed-off-by: Andres Gomez <agomez at igalia.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c373a5990650ea577b8b322ddf5a80e4af9b230
Author: Andres Gomez <agomez at igalia.com>
Date: Tue Apr 25 23:57:17 2017 +0300
cherry-ignore: fix typo in a2b10g10r10 fast clear calculation
The fixes script finds 2 commit references but it is really only one,
and only in master.
Signed-off-by: Andres Gomez <agomez at igalia.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a93c1e07030c2abfed0041cac05333a1207071fc
Author: Andres Gomez <agomez at igalia.com>
Date: Tue Apr 25 23:45:10 2017 +0300
cherry-ignore: Revert "i965/fs: Don't emit SEL instructions for type-converting MOVs."
The commit depends on earlier commits which did not land in branch.
Signed-off-by: Andres Gomez <agomez at igalia.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=df53e5844b383abfd1b2ece00d941150141008f9
Author: Rob Clark <robdclark at gmail.com>
Date: Mon Apr 17 21:20:37 2017 -0400
util/queue: don't hang at exit
So atexit() is horrible and 4aea8fe7 is probably not a good idea. But
add an extra layer of duct-tape to the problem. Otherwise we hit a
situation where app using an atexit() handler that runs later than ours
doesn't hang when trying to tear down a context.
(gdb) bt
#0 util_queue_killall_and_wait (queue=queue at entry=0x52bc80) at ../../../src/util/u_queue.c:264
#1 0x0000007fb6c380c0 in atexit_handler () at ../../../src/util/u_queue.c:51
#2 0x0000007fb7730e2c in __run_exit_handlers () from /lib64/libc.so.6
#3 0x0000007fb7730e5c in exit () from /lib64/libc.so.6
#4 0x0000007fb7ce17dc in piglit_report_result (result=PIGLIT_PASS) at /home/robclark/src/piglit/tests/util/piglit-util.c:267
#5 0x0000007fb7ef99f8 in process_next_event (x11_fw=0x432c20) at /home/robclark/src/piglit/tests/util/piglit-framework-gl/piglit_x11_framework.c:139
#6 0x0000007fb7ef9a90 in enter_event_loop (winsys_fw=0x432c20) at /home/robclark/src/piglit/tests/util/piglit-framework-gl/piglit_x11_framework.c:153
#7 0x0000007fb7ef8e50 in run_test (gl_fw=0x432c20, argc=1, argv=0x7ffffff588) at /home/robclark/src/piglit/tests/util/piglit-framework-gl/piglit_winsys_framework.c:88
#8 0x0000007fb7edb890 in piglit_gl_test_run (argc=1, argv=0x7ffffff588, config=0x7ffffff400) at /home/robclark/src/piglit/tests/util/piglit-framework-gl.c:203
#9 0x0000000000401224 in main (argc=1, argv=0x7ffffff588) at /home/robclark/src/piglit/tests/bugs/drawbuffer-modes.c:46
(gdb) c
Continuing.
[Thread 0x7fb67580c0 (LWP 3471) exited]
^C
Thread 1 "drawbuffer-mode" received signal SIGINT, Interrupt.
0x0000007fb72dda34 in pthread_cond_wait@@GLIBC_2.17 () from /lib64/libpthread.so.0
(gdb) bt
#0 0x0000007fb72dda34 in pthread_cond_wait@@GLIBC_2.17 () from /lib64/libpthread.so.0
#1 0x0000007fb6c38304 in cnd_wait (mtx=0x5bdc90, cond=0x5bdcc0) at ../../../include/c11/threads_posix.h:159
#2 util_queue_fence_wait (fence=0x5bdc90) at ../../../src/util/u_queue.c:106
#3 0x0000007fb6daac70 in fd_batch_sync (batch=0x5bdc70) at ../../../../../src/gallium/drivers/freedreno/freedreno_batch.c:233
#4 batch_reset (batch=batch at entry=0x5bdc70) at ../../../../../src/gallium/drivers/freedreno/freedreno_batch.c:183
#5 0x0000007fb6daa5e0 in batch_flush (batch=0x5bdc70) at ../../../../../src/gallium/drivers/freedreno/freedreno_batch.c:290
#6 fd_batch_flush (batch=0x5bdc70, sync=<optimized out>) at ../../../../../src/gallium/drivers/freedreno/freedreno_batch.c:308
#7 0x0000007fb6daba2c in fd_bc_flush (cache=0x461220, ctx=0x52b920) at ../../../../../src/gallium/drivers/freedreno/freedreno_batch_cache.c:141
#8 0x0000007fb6dac954 in fd_context_flush (pctx=0x52b920, fence=0x0, flags=<optimized out>) at ../../../../../src/gallium/drivers/freedreno/freedreno_context.c:54
#9 0x0000007fb6b43294 in st_glFlush (ctx=<optimized out>) at ../../../src/mesa/state_tracker/st_cb_flush.c:121
#10 0x0000007fb69a84e8 in _mesa_make_current (newCtx=newCtx at entry=0x0, drawBuffer=drawBuffer at entry=0x0, readBuffer=readBuffer at entry=0x0) at ../../../src/mesa/main/context.c:1654
#11 0x0000007fb6b7ca58 in st_api_make_current (stapi=<optimized out>, stctxi=0x0, stdrawi=0x0, streadi=0x0) at ../../../src/mesa/state_tracker/st_manager.c:827
#12 0x0000007fb6cc87e8 in dri_unbind_context (cPriv=<optimized out>) at ../../../../../src/gallium/state_trackers/dri/dri_context.c:217
#13 0x0000007fb6cc80b0 in driUnbindContext (pcp=0x5271e0) at ../../../../../../src/mesa/drivers/dri/common/dri_util.c:591
#14 0x0000007fb7d1da08 in MakeContextCurrent (dpy=0x433380, draw=0, read=0, gc_user=0x0) at ../../../src/glx/glxcurrent.c:214
#15 0x0000007fb7a8d5e0 in glx_platform_make_current () from /lib64/libwaffle-1.so.0
#16 0x0000007fb7a894e4 in waffle_make_current () from /lib64/libwaffle-1.so.0
#17 0x0000007fb7ef8c60 in piglit_wfl_framework_teardown (wfl_fw=0x432c20) at /home/robclark/src/piglit/tests/util/piglit-framework-gl/piglit_wfl_framework.c:628
#18 0x0000007fb7ef939c in piglit_winsys_framework_teardown (winsys_fw=0x432c20) at /home/robclark/src/piglit/tests/util/piglit-framework-gl/piglit_winsys_framework.c:238
#19 0x0000007fb7ef9c30 in destroy (gl_fw=0x432c20) at /home/robclark/src/piglit/tests/util/piglit-framework-gl/piglit_x11_framework.c:212
#20 0x0000007fb7edb7c4 in destroy () at /home/robclark/src/piglit/tests/util/piglit-framework-gl.c:184
#21 0x0000007fb7730e2c in __run_exit_handlers () from /lib64/libc.so.6
#22 0x0000007fb7730e5c in exit () from /lib64/libc.so.6
#23 0x0000007fb7ce17dc in piglit_report_result (result=PIGLIT_PASS) at /home/robclark/src/piglit/tests/util/piglit-util.c:267
#24 0x0000007fb7ef99f8 in process_next_event (x11_fw=0x432c20) at /home/robclark/src/piglit/tests/util/piglit-framework-gl/piglit_x11_framework.c:139
#25 0x0000007fb7ef9a90 in enter_event_loop (winsys_fw=0x432c20) at /home/robclark/src/piglit/tests/util/piglit-framework-gl/piglit_x11_framework.c:153
#26 0x0000007fb7ef8e50 in run_test (gl_fw=0x432c20, argc=1, argv=0x7ffffff588) at /home/robclark/src/piglit/tests/util/piglit-framework-gl/piglit_winsys_framework.c:88
#27 0x0000007fb7edb890 in piglit_gl_test_run (argc=1, argv=0x7ffffff588, config=0x7ffffff400) at /home/robclark/src/piglit/tests/util/piglit-framework-gl.c:203
#28 0x0000000000401224 in main (argc=1, argv=0x7ffffff588) at /home/robclark/src/piglit/tests/bugs/drawbuffer-modes.c:46
(gdb) r
Fixes: 4aea8fe7 ("gallium/u_queue: fix random crashes when the app calls exit()")
Signed-off-by: Rob Clark <robdclark at gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
(cherry picked from commit 6fb7935dedc87ffd767a2999f402ce1a46d18cce)
[Andres Gomez: rename mtx_* back to pipe_mutex_*]
Signed-off-by: Andres Gomez <agomez at igalia.com>
Conflicts:
src/gallium/auxiliary/util/u_queue.c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0e3fd35eb28c95261f10567aeeed461baa880686
Author: Andres Gomez <agomez at igalia.com>
Date: Tue Apr 25 23:17:27 2017 +0300
cherry-ignore: Revert "etnaviv: Cannot render to rb-swapped formats"
Reverts a commit in stable only because a new feature in master
replaces it.
Signed-off-by: Andres Gomez <agomez at igalia.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c8f4160c404291be26594f1dc0f464444f8f4490
Author: Emil Velikov <emil.velikov at collabora.com>
Date: Wed Apr 19 11:35:10 2017 +0100
st/clover: add space between < and ::
As pointed out by compiler
./llvm/codegen.hpp:52:22: error: ‘<::’ cannot begin a template-argument list [-fpermissive]
./llvm/codegen.hpp:52:22: note: ‘<:’ is an alternate spelling for ‘[’. Insert whitespace between ‘<’ and ‘::’
Cc: Francisco Jerez <currojerez at riseup.net>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
Reviewed-by: Vedran Miletić <vedran at miletic.net>
(cherry picked from commit dd6ec78b4fc1208c9ec330642ad42361fea91678)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=313f48f0300f3e07c026265fc692279a245e1616
Author: Nanley Chery <nanley.g.chery at intel.com>
Date: Thu Apr 13 09:52:31 2017 -0700
anv/cmd_buffer: Disable CCS on BDW input attachments
The description under RENDER_SURFACE_STATE::RedClearColor says,
For Sampling Engine Multisampled Surfaces and Render Targets:
Specifies the clear value for the red channel.
For Other Surfaces:
This field is ignored.
This means that the sampler on BDW doesn't support CCS.
Cc: Samuel Iglesias Gonsálvez <siglesias at igalia.com>
Cc: Jordan Justen <jordan.l.justen at intel.com>
Cc: <mesa-stable at lists.freedesktop.org>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Signed-off-by: Nanley Chery <nanley.g.chery at intel.com>
(cherry picked from commit d9d793696bf54e970491302605a1efd0aa182d1b)
[Andres Gomez: _ccs_e renamed back to _lossless_compression]
Signed-off-by: Andres Gomez <agomez at igalia.com>
Conflicts:
src/intel/vulkan/genX_cmd_buffer.c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=de9483a6cb97a34d47a04660061afd18a9fc6f41
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Fri Apr 21 01:28:13 2017 -0700
i965/vec4: Avoid reswizzling MACH instructions in opt_register_coalesce().
opt_register_coalesce() was optimizing sequences such as:
mul(8) acc0:D, attr18.xyyy:D, attr19.xyyy:D
mach(8) vgrf5.xy:D, attr18.xyyy:D, attr19.xyyy:D
mov(8) m4.zw:F, vgrf5.xxxy:F
into:
mul(8) acc0:D, attr18.xyyy:D, attr19.xyyy:D
mach(8) m4.zw:D, attr18.xxxy:D, attr19.xxxy:D
This doesn't work - if we're going to reswizzle MACH, we'd need to
reswizzle the MUL as well. Here, the MUL fills the accumulator's .zw
components with attr18.yy * attr19.yy. But the MACH instruction expects
.z to contain attr18.x * attr19.x. Bogus results ensue.
No change in shader-db on Haswell. Prevents regressions in Timothy's
patches to use enhanced layouts for varying packing (which rearrange
code just enough to trigger this pre-existing bug, but were fine
themselves).
Acked-by: Timothy Arceri <tarceri at itsqueeze.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
(cherry picked from commit 2faf227ec2e22c7a37e0a54783a3f0a0062ac852)
Squashed with commit:
i965/vec4: Use reads_accumulator_implicitly(), not MACH checks.
Curro pointed out that I should not just check for MACH, but use
the reads_accumulator_implicitly() helper, which would also prevent
the same bug with MAC and SADA2 (if we ever decide to use them).
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Francisco Jerez <currojerez at riseup.net>
(cherry picked from commit 6b10c37b9c3a73add73f444fe1aee73c9ec82c94)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4c2356f13cb199dad474d38fecd424d200e4cffd
Author: Francisco Jerez <currojerez at riseup.net>
Date: Thu Apr 20 11:42:27 2017 -0700
intel/fs: Take into account amount of data read in spilling cost heuristic.
Until now the spilling cost calculation was neglecting the amount of
data read from the register during the spilling cost calculation.
This caused it to make suboptimal decisions in some cases leading to
higher memory bandwidth usage than necessary.
Improves Unigine Heaven performance by ~4% on BDW, reversing an
unintended FPS regression from my previous commit
147e71242ce539ff28e282f009c332818c35f5ac with n=12 and statistical
significance 5%. In addition SynMark2 OglCSDof performance is
improved by an additional ~5% on SKL, and a Kerbal Space Program
apitrace around the Moho planet I can provide on request improves by
~20%.
Cc: <mesa-stable at lists.freedesktop.org>
Reviewed-by: Plamena Manolova <plamena.manolova at intel.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
(cherry picked from commit 58324389be7bc7c5e10093b9cc0a8efa9b4c93a9)
[Andres Gomez: resolve trivial conflicts]
Signed-off-by: Andres Gomez <agomez at igalia.com>
Conflicts:
src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a7c86ab750bc7e712068ac32ce83ad81c0b21bf8
Author: Francisco Jerez <currojerez at riseup.net>
Date: Thu Apr 20 11:44:01 2017 -0700
intel/fs: Use regs_written() in spilling cost heuristic for improved accuracy.
This is what we use later on to compute the number of registers that
will actually get spilled to memory, so it's more likely to match
reality than the current open-coded approximation.
Cc: <mesa-stable at lists.freedesktop.org>
Reviewed-by: Plamena Manolova <plamena.manolova at intel.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
(cherry picked from commit ecc19e12dca95d2571d3761dea6dec24b061013c)
[Andres Gomez: resolve trivial conflicts]
Signed-off-by: Andres Gomez <agomez at igalia.com>
Conflicts:
src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5403c029838f16c1ee7972e9e4ec9c7d9f575ee4
Author: Andres Gomez <agomez at igalia.com>
Date: Tue Apr 25 04:32:17 2017 +0300
cherry-ignore: Fix typos.
Nomination in stable.
17.1 nomination only.
The commit depends on earlier commit 7748c3f5eb1 which did not land in
branch and the part that could be merged is not really providing
anything relevant to stable.
Signed-off-by: Andres Gomez <agomez at igalia.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7ab11a982220762d2f7b29f8aa20af0f3a169126
Author: Marek Olšák <marek.olsak at amd.com>
Date: Sun Apr 9 16:03:59 2017 +0200
st/mesa: invalidate the readpix cache in st_indirect_draw_vbo
Cc: <mesa-stable at lists.freedesktop.org>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 7cd6e2df65de9e2f0d77022a64c4e48ca2ebcb33)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0022df96be135bbdcb00638a38b13046cee76660
Author: Emil Velikov <emil.velikov at collabora.com>
Date: Sun Apr 16 14:39:03 2017 +0100
winsys/sw/dri: don't use GNU void pointer arithmetic
Resolves build issues like the following:
src/gallium/winsys/sw/dri/dri_sw_winsys.c:203:31: error: pointer of type ‘void *’ used in arithmetic [-Werror=pointer-arith]
data = dri_sw_dt->data + (dri_sw_dt->stride * box->y) + box->x * blsize;
^
src/gallium/winsys/sw/dri/dri_sw_winsys.c:203:62: error: pointer of type ‘void *’ used in arithmetic [-Werror=pointer-arith]
data = dri_sw_dt->data + (dri_sw_dt->stride * box->y) + box->x * blsize;
^
Cc: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
(cherry picked from commit 309f4067a795219027f523bf0733692e48f2fd58)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8a46da37319e50c1ee7b601e3f0a7b5f7def4a6f
Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date: Fri Apr 7 18:24:44 2017 +0200
vbo: fix gl_DrawID handling in glMultiDrawArrays
Fixes a bug in
KHR-GL45.shader_draw_parameters_tests.ShaderMultiDrawArraysParameters.
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
(cherry picked from commit 51deba0eb35d0d27560bb7dad24b8d39abb58be6)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d066714fbb1d2e1271c077a3749a61d8d9ed07ad
Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date: Fri Apr 7 18:20:34 2017 +0200
mesa: move glMultiDrawArrays to vbo and fix error handling
When any count[i] is negative, we must skip all draws.
Moving to vbo makes the subsequent change easier.
v2:
- provide the function in all contexts, including GLES
- adjust validation accordingly to include the xfb check
v3:
- fix mix-up of pre- and post-xfb prim count (Nils Wallménius)
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
(cherry picked from commit 42d5465b9ba85b4918b9e6fb57994720e3c8a80b)
[Andres Gomez: resolve trivial conflicts]
Signed-off-by: Andres Gomez <agomez at igalia.com>
Conflicts:
src/mesa/main/varray.c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ddf884a9e3e0846bdba8518a3f05bfb2acb53baa
Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date: Thu Apr 13 21:06:11 2017 +0200
mesa: extract need_xfb_remaining_prims_check
The same logic needs to be applied to glMultiDrawArrays.
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
(cherry picked from commit 756e9ebbdd84018382908d3556973a62dbda09ca)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b4afdeb1727e929c53a4b4750046f0015a577d3
Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date: Thu Apr 13 20:53:17 2017 +0200
mesa: fix remaining xfb prims check for GLES with multiple instances
Found by inspection.
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
(cherry picked from commit ea9a8940cadb30ac8d72a26b82bdb54872c0e199)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=88e5afd14651734f02c397c7dc35a81c8232ef14
Author: Andres Gomez <agomez at igalia.com>
Date: Tue Apr 25 03:34:53 2017 +0300
cherry-ignore: fix crash if ctx torn down with no rendering
Nomination in stable.
17.1 nomination only.
Fixes earlier commit 0b613c20 which did not land in branch.
Signed-off-by: Andres Gomez <agomez at igalia.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=efe50f2dde2a110a8ce57a5062006943df26d47e
Author: Andres Gomez <agomez at igalia.com>
Date: Tue Apr 25 03:24:29 2017 +0300
cherry-ignore: Add the pci_id into the shader cache UUID
Nomination in stable.
The commit depends on earlier commit 656e30b6860 which did not land in
branch, and some other dependencies
Signed-off-by: Andres Gomez <agomez at igalia.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4b3efe993e18168d6fe49bad4e8272b42e5db83c
Author: Boyan Ding <boyan.j.ding at gmail.com>
Date: Wed Apr 12 21:14:22 2017 +0800
nir: Destination component count of shader_clock intrinsic is 2
This fixes the following error when using ARB_shader_clock on i965:
vec1 32 ssa_0 = intrinsic shader_clock () () ()
intrinsic store_var (ssa_0) (clock_retval) (3) /* wrmask=xy */
error: src->ssa->num_components == num_components (nir/nir_validate.c:204)
Signed-off-by: Boyan Ding <boyan.j.ding at gmail.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit ff29f488d4a2d05cdefbca7d675c479b2a1780a0)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=255d689dcd09a8c3737b11d7491aeab3547a2525
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Thu Apr 6 14:15:55 2017 -0700
anv/blorp: Properly handle VK_ATTACHMENT_UNUSED
The Vulkan driver was originally written under the assumption that
VK_ATTACHMENT_UNUSED was basically just for depth-stencil attachments.
However, the way things fell together, VK_ATTACHMENT_UNUSED can be used
anywhere in the subpass description. The blorp-based clear and resolve
code has a bunch of places where we walk lists of attachments and we
weren't handling VK_ATTACHMENT_UNUSED everywhere. This commit should
fix all of them.
Reviewed-by: Nanley Chery <nanley.g.chery at intel.com>
Cc: <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 220974b38dfcd557f4a6bc723e4b5d15add39f84)
[Andres Gomez: the anv_subpass structure was not storing yet
VkAttachmentReference and recovered a hunk that was not needed in
master]
Signed-off-by: Andres Gomez <agomez at igalia.com>
Conflicts:
src/intel/vulkan/anv_blorp.c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=af58e0dbe6daa9f5de20f0d2fdd3c776ffebc704
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Fri Apr 7 10:33:25 2017 -0700
anv/cmd_buffer: Use the null surface state for ATTACHMENT_UNUSED
Reviewed-by: Nanley Chery <nanley.g.chery at intel.com>
Cc: <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 21d2ca72d88e00ddf37c7e1030472e184a038195)
[Andres Gomez: the anv_subpass structure was not storing yet VkAttachmentReference]
Signed-off-by: Andres Gomez <agomez at igalia.com>
Conflicts:
src/intel/vulkan/genX_cmd_buffer.c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9717c0aad5e18078a5ad827494f9a2a62162dfe1
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Fri Apr 7 10:31:01 2017 -0700
anv/cmd_buffer: Always set up a null surface state
We're about to start requiring it in yet another case and calculating
exactly when one is needed is starting to get prohibitively expensive.
A single surface state doesn't take up that much space so we may as well
create one all the time.
Reviewed-by: Nanley Chery <nanley.g.chery at intel.com>
Cc: <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 02eca8b6f897a0c7ab5f2a6ff5d204cf379681f6)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f26047871f5a56522f803e26dc7639edf20c7365
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Fri Mar 31 15:33:39 2017 -0700
anv/cmd_buffer: Flush the VF cache at the top of all primaries
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Cc: "13.0 17.0" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit e1f6fb8021bcdd407fae77917502891b9239f53c)
[Andres Gomez: resolve trivial conflicts]
Signed-off-by: Andres Gomez <agomez at igalia.com>
Conflicts:
src/intel/vulkan/genX_cmd_buffer.c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c09f729d939e8f01ed26045156a2595e3f4b3cf0
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Fri Mar 31 15:33:51 2017 -0700
anv/blorp: Flush the texture cache in UpdateBuffer
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Cc: "13.0 17.0" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 939337e49fb8a6e16f83e4e030743f91b1b05cc5)
[Andres Gomez: replace anv_state_flush with anv_state_clflush]
Signed-off-by: Andres Gomez <agomez at igalia.com>
Conflicts:
src/intel/vulkan/anv_blorp.c
Squashed with commit:
anv: blorp: flush memory after copy
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Cc: "13.0 17.0" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit d71efbe5f2a0ff934b8e9eeb96cd680a83bc0259)
[Andres Gomez: replace anv_state_flush with anv_state_clflush]
Signed-off-by: Andres Gomez <agomez at igalia.com>
Conflicts:
src/intel/vulkan/anv_blorp.c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a6a42a84cf50392b1010b3afa5a0e1c395dbaebf
Author: Boyan Ding <boyan.j.ding at gmail.com>
Date: Mon Apr 10 22:55:58 2017 +0800
nvc0/ir: Properly handle a "split form" of predicate destination
GF100's ISA encoding has a weird form of predicate destination where its
3 bits are split across whole the instruction. Use a dedicated setPDSTL
function instead of original defId which is incorrect in this case.
v2: (Ilia Mirkin)
Change API of setPDSTL() to handle cases of no output
Fix setting of the highest bit in setPDSTL()
Cc: mesa-stable at lists.freedesktop.org
Signed-off-by: Boyan Ding <boyan.j.ding at gmail.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
(cherry picked from commit d941ef38292dd86469a792c8359e0fc8c4fa154c)
More information about the mesa-commit
mailing list