Timo Aaltonen pushed to branch upstream-unstable at X Strike Force / lib / mesa
Commits: 8320a072 by Emil Velikov at 2019-01-17T11:30:49Z docs: add sha256 checksums for 18.3.2 Signed-off-by: Emil Velikov <emil.veli...@collabora.com> - - - - - ec40bc62 by Emil Velikov at 2019-01-29T14:58:58Z cherry-ignore: radv: Fix multiview depth clears fixes: This commit requires commits aeaf8dbd097 and 7484bc894b9 which did not land in branch. Signed-off-by: Emil Velikov <emil.veli...@collabora.com> - - - - - 029dced4 by Emil Velikov at 2019-01-29T15:10:34Z cherry-ignore: spirv: Handle arbitrary bit sizes for deref array indices stable The commits aren't suitable in their present form. Signed-off-by: Emil Velikov <emil.veli...@collabora.com> - - - - - fa11468d by Andres Gomez at 2019-01-29T15:12:32Z bin/get-pick-list.sh: fix the oneline printing "--summary" will also print extended header information such as creations, renames and mode changes. Let's just use "--no-patch", which suppresses the diff output. v2: Use "--no-patch" instead of the "-s" abbreviation (Eric). Fixes: 559c32d2412 ("bin/get-pick-list.sh: simplify git oneline printing") Cc: Juan A. Suarez <jasua...@igalia.com> Cc: Eric Engestrom <eric.engest...@intel.com> Cc: Dylan Baker <dy...@pnwbakers.com> Cc: Emil Velikov <emil.veli...@collabora.com> Signed-off-by: Andres Gomez <ago...@igalia.com> Reviewed-by: Eric Engestrom <eric.engest...@intel.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> Reviewed-by: Juan A. Suarez <jasua...@igalia.com> (cherry picked from commit 716ed41a36037459ed5bfe0775484ac2cbd90707) - - - - - 22070503 by Andres Gomez at 2019-01-29T15:12:36Z bin/get-pick-list.sh: fix redirection in sh "&>" is bash specific. Fixes: e0dbfc99537 ("bin/get-pick-list.sh: warn when commit lists invalid sha") Cc: Juan A. Suarez <jasua...@igalia.com> Cc: Eric Engestrom <eric.engest...@intel.com> Cc: Dylan Baker <dy...@pnwbakers.com> Cc: Emil Velikov <emil.veli...@collabora.com> Signed-off-by: Andres Gomez <ago...@igalia.com> Reviewed-by: Eric Engestrom <eric.engest...@intel.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> Reviewed-by: Juan A. Suarez <jasua...@igalia.com> (cherry picked from commit 3ec9ab80b870efffb5ba7c7a00b86b2df729ec6d) - - - - - 5d2cfa64 by Bas Nieuwenhuizen at 2019-01-29T15:12:39Z radv: Only use 32 KiB per threadgroup on Stoney. Causes hangs on some machines. What works for dEQP-VK.tessellation.shader_input_output.barrier: - running num_patches = 6 (which limits LDS to 32 KiB) - running num_patches = 8, and artificially cutting LDS size at 32 KiB. CC: <mesa-sta...@lists.freedesktop.org> Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> (cherry picked from commit 76b12fa564a5f48e3f2264718dea0158d0c05b4c) - - - - - 4b91802b by Marek Olšák at 2019-01-29T15:12:43Z radeonsi: also apply the GS hang workaround to draws without tessellation ported from AMDVLK. Cc: 18.3 <mesa-sta...@lists.freedesktop.org> Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> (cherry picked from commit 5183e794affbbbf7dc959332619b0852c21536d6) - - - - - cad3d073 by Samuel Pitoiset at 2019-01-29T15:18:57Z radv: clean up setting partial_es_wave for distributed tess on VI Only needed when the pipeline actually uses tessellation. I don't think that changes anything, except improving readability. Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> (cherry picked from commit d9d14346c2ba66bfef7ca120ccbcd3201ca32359) - - - - - bd9edb5f by Bas Nieuwenhuizen at 2019-01-29T15:19:03Z radv: Set partial_vs_wave for pipelines with just GS, not tess. Looking at -pro we need to enable it for pipelines with just a GS too. This seems to reduce the hangs from https://bugs.freedesktop.org/show_bug.cgi?id=109242 on a RX 550 to the point where I can't reproduce, after the false start with the wd_switch_on_eop patch due to flakiness. (but people are reporting it does not fix the issue completely for them on polaris 11) CC: <mesa-sta...@lists.freedesktop.org> Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> (cherry picked from commit 568e7a2998e39263c41ec70ec67bcc5601477781) - - - - - f0eee7df by Pierre Moreau at 2019-01-29T15:19:25Z meson: Fix with_gallium_icd to with_opencl_icd `with_gallium_icd` is never used throughout the different Meson build files, whereas `with_opencl_icd` tracks whether or not `gallium-opencl` was set to "icd". Fixes: 42ea0631f108d82554339530d6c88aa1b448af1e ("meson: build clover") Signed-off-by: Pierre Moreau <pierre.mor...@free.fr> Reviewed-by: Dylan Baker <dy...@pnwbakers.com> (cherry picked from commit 0b736f7fd4852bdea2ac6be9a018a41065252233) - - - - - e38d275a by Bruce Cherniak at 2019-01-29T15:19:40Z gallium/swr: Fix multi-context sync fence deadlock. Various recreation scenarios lead to API thread getting stuck in swr_fence_finish(). This is a multi-context issue, whereby one context overwrites the fence read-value with a previous sync's lesser value. The fence sync value is supposed to be always increasing. In swr_fence_cb(), only update the "read" value if the new value is greater. (This may seem like we're not waiting on the other context to finish, but had we needed for it to finish there would have been a wait prior to submitting a new sync.) cc: mesa-sta...@lists.freedesktop.org (cherry picked from commit ed7673afd2d1a31bfcec0520743acd2681b462e6) - - - - - 8f1c75e9 by Dylan Baker at 2019-01-29T15:19:49Z meson: allow building dri driver without window system if osmesa is classic This was already enabled for gallium based osmesa with gallium drivers in 9d10581897ef7cfa0f6c392e2048cc04357281b9, so do the same for classic driver with classic osmesa. Fixes: cbbd5bb889a2c271a504c379f36a7cb717a85af4 ("meson: build classic osmesa") Reviewed-by: Jordan Justen <jordan.l.jus...@intel.com> (cherry picked from commit 431e9abaaba6386aa7fbc1ec0e2566a3f8999f5d) - - - - - 92273935 by Eric Anholt at 2019-01-29T15:20:43Z vc4: Don't leak the GPU fd for renderonly usage. Noticed while debugging V3D -- the ro->gpu_fd was freshly opened in ro setup, and it needs to stay open until screen close (since it may be used by renderonly) and should be the same one used by the vc4 screen. Fixes: 7029ec05e2c7 ("gallium: Add renderonly-based support for pl111+vc4.") (cherry picked from commit 99ef66c325a99b3e191987d8327e7e4cd4aafcd7) - - - - - 5f25cfda by Jason Ekstrand at 2019-01-29T17:43:42Z anv/nir: Rework arguments to apply_pipeline_layout Instead of taking a whole pipeline (which could be anything!), just take a physical device and robust_buffer_access boolean. This makes it easier to verify that only the things in the hash actually affect pipeline compilation. Reviewed-by: Iago Toral Quiroga <ito...@igalia.com> (cherry picked from commit a24654b49d36609b43a5ef6f04453ab284a6ea4f) - - - - - 252beed9 by Iago Toral Quiroga at 2019-01-29T17:44:27Z anv/device: fix maximum number of images supported We had defined MAX_IMAGES as 8, which we used to size the array for image push constant data. The comment there stated that this was for gen8, but anv_nir_apply_pipeline_layout runs for all gens and writes that array, asserting that we don't exceed that number of images, which imposes a limit of MAX_IMAGES on all gens. Furthermore, despite this, we are exposing up to 64 images per shader stage on all gens, gen8 included. This patch lowers the number of images we expose in gen8 to 8 and keeps 64 images for gen9+ while making sure that only pre-SKL gens use push constant space to handle images. v2: - <= instead of < in the assert (Eric, Lionel) - Change the way the assertion is written (Eric) v3: - Revert the way the assertion is written to the form it had in v1, the version in v2 was not equivalent and was incorrect. (Lionel) v4: - gen9+ doesn't need push constants for images at all (Jason) Cc: mesa-sta...@lists.freedesktop.org Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> (v3) (cherry picked from commit f92c5bc8f3f517f3dadab27c5fcf28a6c2747204) - - - - - ea2bf29e by Bas Nieuwenhuizen at 2019-01-29T17:44:27Z nir: Account for atomics in copy propagation. Otherwise writes get propagated across atomics if no barrier is used. Without barrier writes should still be visible in the same invocation, so an atomic has to be considered a write. CC: <mesa-sta...@lists.freedesktop.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.olive...@intel.com> Fixes: b3c61469255 "nir: Copy propagation between blocks" Fixes: 62332d139c8 "nir: Add a local variable-based copy propagation pass" (cherry picked from commit 8424cd8fbd1671c4c13f57cfa34bf8145d0fffcf) - - - - - 98a661f2 by Karol Herbst at 2019-01-29T17:44:27Z nv50/ir: disable tryCollapseChainedMULs in ConstantFolding for precise instructions fixes dEQP-GLES2.functional.shaders.invariance.mediump.loop_3 CC: <mesa-sta...@lists.freedesktop.org> Signed-off-by: Karol Herbst <kher...@redhat.com> Reviewed-by: Ilia Mirkin <imir...@alum.mit.edu> (cherry picked from commit 30b5c9eda2fe4c335cc15cb921e4f7774af0879e) - - - - - 313c1487 by Timothy Arceri at 2019-01-29T17:44:27Z ac/nir_to_llvm: fix interpolateAt* for arrays This builds on the recent interpolate fix by Rhys ee8488ea3b99. This fixes the arb_gpu_shader5 interpolateAt* tests that contain arrays. Fixes: ee8488ea3b99 ("ac/nir,radv,radeonsi/nir: use correct indices for interpolation intrinsics") Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> (cherry picked from commit 9e669ed22b52857495593b92537d53c9ead7d424) - - - - - 93db1e71 by Karol Herbst at 2019-01-29T17:44:27Z glsl/lower_output_reads: set invariant and precise flags on temporaries fixes a couple of deqp tests (on nvc0 and potential other drivers): dEQP-GLES3.functional.shaders.invariance.highp.common_subexpression_1 dEQP-GLES3.functional.shaders.invariance.highp.common_subexpression_2 dEQP-GLES3.functional.shaders.invariance.highp.common_subexpression_3 dEQP-GLES3.functional.shaders.invariance.mediump.common_subexpression_1 dEQP-GLES3.functional.shaders.invariance.mediump.common_subexpression_2 dEQP-GLES3.functional.shaders.invariance.mediump.common_subexpression_3 dEQP-GLES3.functional.shaders.invariance.lowp.common_subexpression_1 dEQP-GLES3.functional.shaders.invariance.lowp.common_subexpression_2 dEQP-GLES3.functional.shaders.invariance.lowp.common_subexpression_3 CC: <mesa-sta...@lists.freedesktop.org> Signed-off-by: Karol Herbst <kher...@redhat.com> Reviewed-by: Ilia Mirkin <imir...@alum.mit.edu> (cherry picked from commit 987744be9850bfe3a7c3c9556ae5d48ee5c34352) - - - - - f5b6f5ad by Jason Ekstrand at 2019-01-29T17:44:27Z anv: Only parse pImmutableSamplers if the descriptor has samplers Cc: mesa-sta...@lists.freedesktop.org Reviewed-by: Tapani Pälli <tapani.pa...@intel.com> Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Reviewed-by: Iago Toral Quiroga <ito...@igalia.com> (cherry picked from commit c7f4a2867ce492d78c1f8e2870c0a593d280572d) - - - - - a1605e77 by Eric Engestrom at 2019-01-29T17:44:27Z configure: EGL requirements only apply if EGL is built Issue was hit with this configuration: --disable-{egl,gbm} --with-platform=drm Signed-off-by: Eric Engestrom <eric.engest...@intel.com> Fixes: 3208fd2e46b ("configure: move platform handling further up") Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit 610f956fdead37da49ee2857a2261c3dfd8fc3cd) - - - - - b6cd30de by Jason Ekstrand at 2019-01-29T17:44:27Z nir/xfb: Fix offset accounting for dvec3/4 Before, we were double-counting the component slots when we had a dvec3 or dvec4. Instead, just add them in once and manually offset the recorded output offset. Fixes: 19064b8c "nir: Add a pass for gathering transform feedback info" Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Reviewed-by: Alejandro Piñeiro <apinhe...@igalia.com> (cherry picked from commit 4f99ac9144abda9b4e7d0891571eb1691b853c25) - - - - - ae91c29a by Marek Olšák at 2019-01-29T17:44:27Z radeonsi: fix a u_blitter crash after a shader with FBFETCH This fixes an assertion failure with GL CTS when cts-runner is used. (not a specific test) Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108877 Cc: 18.3 <mesa-sta...@lists.freedesktop.org> (cherry picked from commit caa2dcd7309311c3f707b1855c7e30c1c72818e2) - - - - - 77ac39c3 by Marek Olšák at 2019-01-29T17:44:27Z radeonsi: fix rendering to tiny viewports where the viewport center is > 8K This fixes an assertion failure with GL CTS when cts-runner is used. (not a specific test) Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108877 Cc: 18.3 <mesa-sta...@lists.freedesktop.org> (cherry picked from commit 4c4c8bb1f047234d738ab9bb70938bee4733ed2e) - - - - - 9d456510 by Rob Clark at 2019-01-29T17:44:27Z loader: fix the no-modifiers case Normally modifiers take precendence over use flags, as they are more explicit. But if the driver supports modifiers, but the xserver does not, then we should fallback to the old mechanism of allocating a buffer using 'use' flags. Fixes: 069fdd5f9facbd72fb6a289696c7b74e3237e70f Signed-off-by: Rob Clark <robdcl...@gmail.com> Reviewed-by: Kristian H. Kristensen <hoegsb...@chromium.org> (cherry picked from commit c56fe4118a2dd991ff1b2a532c0f234eddd435e9) - - - - - 8a6c1544 by Marek Olšák at 2019-01-29T17:44:27Z st/mesa: purge framebuffers when unbinding a context This fixes pipe_surface "leaks". Cc: 18.3 <mesa-sta...@lists.freedesktop.org> Acked-by: Timothy Arceri <tarc...@itsqueeze.com> (cherry picked from commit c89e8470e58066637c4bfd5c76a2247eb3608b8b) - - - - - 2733d260 by Dave Airlie at 2019-01-29T17:44:27Z dri_interface: add put shm image2 (v2) This adds a new interface to the swrast interface to fix an shm put image bug. The current code adds the x,y src offsets into the offset parameters, however if the x offset is > 0, and the put image copies up to the height of the image, this can trigger an X server validation check to fail and the renderering to get BadMatch. This patch fixes it to pass the x offset coord in as a src x. We cannot pass the Y coordinate due to the horrible code mangling the image w/h vs stride in swrastXPutImage. v2: drop srcx,y from api Cc: <mesa-sta...@lists.freedesktop.org> Reviewed-by: Adam Jackson <a...@redhat.com> (cherry picked from commit db83a2b40f95fa3b9a741e9797dbf3e18f065a71) - - - - - 32c0f59c by Dave Airlie at 2019-01-29T17:44:27Z glx: add support for putimageshm2 path (v2) v2: pass x,0 in as the offset coords at glx level not earlier Cc: <mesa-sta...@lists.freedesktop.org> Reviewed-by: Adam Jackson <a...@redhat.com> (cherry picked from commit 00af91ca463a2486c043c635d94d9958fb1e8700) - - - - - fea0bca1 by Dave Airlie at 2019-01-29T17:44:27Z gallium: use put image shm2 path (v2) This fixes the drisw paths to use the new shm2 interface, so that we don't trigger the X server overflow checks when the x offset is non-zero. This just hides the versioning in drisw, and either passes the src_x or adds the offset fixup for the fallback path. Cc: <mesa-sta...@lists.freedesktop.org> Reviewed-by: Adam Jackson <a...@redhat.com> (cherry picked from commit 1f6b92b47652e7f48f03ef6a4228a19537022d23) - - - - - 8f45b22c by Dylan Baker at 2019-01-29T17:44:27Z meson: fix swr KNL build There's a typo in one of the #defines that breaks compilation. Fixes: e0b037d6979b266d4959c1e31746d4d19c941fdb ("meson: Build SWR driver") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109023 Reviewed-by: Eric Engestrom <eric.engest...@intel.com> (cherry picked from commit 3ba7ab8d2c8454346c3349ddc56cb480eea4f958) - - - - - cadab68f by Dylan Baker at 2019-01-29T17:44:27Z meson: Fix compiler checks for SWR with ICC This is a bit fragile, as the way this "fixes" the check is to move the one that we know is correct before the one that is incorrectly reported as working. In meson 0.49.1 (which isn't out yet) this is fixed that the incorrect check is reported as a failure. Fixes: e0b037d6979b266d4959c1e31746d4d19c941fdb ("meson: Build SWR driver") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109129 Acked-by: Eric Engestrom <eric.engest...@intel.com> (cherry picked from commit 7cb7f35bc76bf21d15ca4b1f4ee724e9ff1e2804) - - - - - 6050d6f1 by Eric Engestrom at 2019-01-29T17:44:27Z meson/vdpau: add missing soversion This mirrors what autotools does in src/gallium/state_trackers/vdpau/Makefile.am and src/gallium/targets/vdpau/Makefile.am: VDPAU_MAJOR = 1 VDPAU_MINOR = 0 libvdpau_gallium_la_LDFLAGS = -version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) Reported-by: Igor Gnatenko <i.gnatenko.br...@gmail.com> Fixes: 68076b87474e7959c161 "meson: build gallium vdpau state tracker" Signed-off-by: Eric Engestrom <eric.engest...@intel.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> Reviewed-by: Dylan Baker <dy...@pnwbakers.com> (cherry picked from commit 69e944036720d826d0548a019f8fe18b9ed57e6e) - - - - - 0b4d381e by Timothy Arceri at 2019-01-29T17:44:27Z ac/nir_to_llvm: fix clamp shadow reference for more hardware Fixes the following piglit test on my VEGA and matches the behaviour in the tgsi backend. tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-clamp-z.shader_test Fixes: 625dcbbc4566 ("amd/common: pass address components individually to ac_build_image_intrinsic") Reviewed-by: Marek Olšák <marek.ol...@amd.com> (cherry picked from commit 5d66f7103f0df6b996951e65483fc5873d9b66df) - - - - - e1374ce1 by Emil Velikov at 2019-01-29T17:44:27Z cherry-ignore: WARNING: Commit XXX lists invalid sha warn The commits refer stale sha, yet don't fix anything in particular. 98984b7cdd79c15cc7331c791f8be61e873b8bbd 9f86f1da7c68b5b900cd6f60925610ff1225a72d Signed-off-by: Emil Velikov <emil.veli...@collabora.com> - - - - - 84f59f6b by Lionel Landwerlin at 2019-01-29T17:44:27Z anv: fix invalid binding table index computation The ++ operator strikes again. Fixes: f92c5bc8f3f517 ("anv/device: fix maximum number of images supported") Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> (cherry picked from commit 4149d41f2e4ea02ca86975d25ab160e69bf0f8e5) - - - - - 991f9ea5 by Dylan Baker at 2019-01-29T17:44:27Z meson: Add warnings and errors when using ICC ICC tries to be helpful by not erroring when it sees something that it doesn't understand, which is completely the opposite of helpful. Meson 0.49.0 does much better at handling this by really trying to make ICC error, but there are some things in mesa that still get ignored until 0.49.1 v2: - Fix id check, which is 'intel' not 'icc' Cc: 18.3 <mesa-sta...@lists.freedesktop.org> Reviewed-by: Eric Engestrom <eric.engest...@intel.com> (v1) (cherry picked from commit c1efa240c91e78385e8e433af134289b006016d0) - - - - - 220490cf by Axel Davy at 2019-01-29T17:44:27Z st/nine: Immediately upload user provided textures Fixes regression caused by 42d672fa6a766363e5703f119607f7c7975918aa st/nine: Bind src not dst in nine_context_box_upload Before that patch, for user provided textures, when the texture was destroyed, the safety check for pending uploads, which according to the code "Following condition cannot happen currently", was flushing the queue and thus triggering the upload. After the patch, the texture destruction was delayed after the upload. However the user frees the texture buffer, as it thinks the texture released. Instead of reverting the faulty patch, this patch instead flushes the csmt queue right away after queuing the upload for this type of textures. This is more future-proof, as we may want to bind the surface for other reasons in the future. Signed-off-by: Axel Davy <davyax...@gmail.com> Cc: 18.3 <mesa-sta...@lists.freedesktop.org> (cherry picked from commit d7433c22e6c9624ca5275a3cd35be79caed9fffc) - - - - - e362fe26 by Niklas Haas at 2019-01-29T17:44:27Z radv: correctly use vulkan 1.0 by default >From the vulkan spec 3.2 "Instances": "Providing a NULL VkInstanceCreateInfo::pApplicationInfo or providing an apiVersion of 0 is equivalent to providing an apiVersion of VK_MAKE_VERSION(1,0,0)." Fixes: ffa15861ef7c924a33e1f "radv: UseEnumerateInstanceVersion for the default version." Reviewed-by: Eric Engestrom <eric.engest...@intel.com> Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> (cherry picked from commit d12dc3939620dcc942523a30a7fcc3271e751a6c) - - - - - 12586d58 by Timothy Arceri at 2019-01-29T17:44:27Z radv/ac: fix some fp16 handling Fixes: b722b29f10d4 ("radv: add support for 16bit input/output") Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> (cherry picked from commit 0907ae35ad0e7733535516fada04948ea7125291) - - - - - 3b9e9e47 by Timothy Arceri at 2019-01-29T17:44:27Z glsl: use remap location when serialising uniform program resource data This allows us to avoid expensive string compares since we already have a map to the pointers. These compares were taking ~30 seconds for a single shader compile in Godot due to it using 64,000+ uniforms. Fixes: c4cff5f40254 ("glsl: add basic support for resource list to shader cache") Reviewed-by: Tapani Pälli <tapani.pa...@intel.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109229 (cherry picked from commit fb78a6cb72270de271f75d6f6c9b5ebadba7a898) - - - - - b280cdb5 by Carsten Haitzler (Rasterman) at 2019-01-29T19:30:12Z vc4: Use named parameters for the NEON inline asm. This makes the asm code more intelligible and clarifies the functional change in the next commit. (commit message and commit squashing by anholt) (cherry picked from commiti 522f68847152e9111def094f7fb35b44f3d0fc80) [Emil: apply the patch to vc4_tiling_lt.c instead of v3d_cpu_tiling.h] Signed-off-by: Emil Velikov <emil.veli...@collabora.com> Conflicts: src/broadcom/common/v3d_cpu_tiling.h - - - - - 813f0a82 by Carsten Haitzler (Rasterman) at 2019-01-30T17:33:23Z vc4: Declare the cpu pointers as being modified in NEON asm. Otherwise, the compiler is free to reuse the register containing the input for another call and assume that the value hasn't been modified. Fixes crashes on texture upload/download with current gcc. We now have to have a temporary for the cpu2 value, since outputs must be lvalues. (commit message by anholt) Fixes: 4d30024238ef ("vc4: Use NEON to speed up utile loads on Pi2.") (cherry picked from commit 300d3ae8b1445b5060f92c77c0f577f4b7b2c7d6) [Emil: apply the patch to vc4_tiling_lt.c instead of v3d_cpu_tiling.h] Signed-off-by: Emil Velikov <emil.veli...@collabora.com> Conflicts: src/broadcom/common/v3d_cpu_tiling.h Squashed with commit: vc4: Declare the last cpu pointer as being modified in NEON asm. Earlier commit addressed 7 of the 8 instances available. v2: Rebase patch back to master (by anholt) Cc: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Cc: Eric Anholt <e...@anholt.net> Fixes: 300d3ae8b14 ("vc4: Declare the cpu pointers as being modified in NEON asm.") Signed-off-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit 385843ac3ce1b868d9e24fcb2dbc0c8d5f5a7c99) Conflicts: src/broadcom/common/v3d_cpu_tiling.h - - - - - f275e16c by Vinson Lee at 2019-01-30T17:33:50Z meson: Fix typo. meson.build:166:21: ERROR: Unknown method "verson_compare" for a string. Fixes: c1efa240c91e ("meson: Add warnings and errors when using ICC") Signed-off-by: Vinson Lee <v...@freedesktop.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.olive...@intel.com> Reviewed-by: Eric Engestrom <eric.engest...@intel.com> Cc: 18.3 <mesa-sta...@lists.freedesktop.org> (cherry picked from commit be5b271ea76d81d32e3dc490ef5b32a61c3fb965) - - - - - f0725855 by Eric Anholt at 2019-01-30T17:33:50Z vc4: Enable NEON asm on meson cross-builds. The core Mesa with_asm_arch and USE_ARM_ASM flags are disabled for meson cross-builds because of the need to run host binaries on the build system. vc4 doesn't need to do that, so skip with_asm_arch to enable NEON on my cross-builds. Fixes: ebcb4c2156e9 ("meson: Enable VC4's NEON assembly support.") (cherry picked from commit 932ed9c00b99e6ec92146ec9e820f546cf3e6551) - - - - - 5e8af9e6 by Tomeu Vizoso at 2019-01-30T17:33:50Z etnaviv: Consolidate buffer references from framebuffers We were leaking surfaces because the references taken in etna_set_framebuffer_state weren't being released on context destroy. Instead of just directly releasing those references in etna_context_destroy, use the util_copy_framebuffer_state helper. Take the chance to remove the duplicated buffer references in compiled_framebuffer_state to avoid confusion. The leak can be reproduced with a client that continuously creates and destroys contexts. Signed-off-by: Tomeu Vizoso <tomeu.viz...@collabora.com> Reported-by: Sjoerd Simons <sjoerd.sim...@collabora.co.uk> Reviewed-by: Christian Gmeiner <christian.gmei...@gmail.com> (cherry picked from commit bf1dfcc3e8120400c9a78d03dd914a786728b5f7) [Emil: resolve trivial conflict - dummy_rt does not exist in branch] Signed-off-by: Emil Velikov <emil.veli...@collabora.com> Conflicts: src/gallium/drivers/etnaviv/etnaviv_context.c - - - - - f2c1d7ac by Timothy Arceri at 2019-01-31T12:05:54Z glsl: Copy function out to temp if we don't directly ref a variable Otherwise we can end up with IR that looks like this: ( (declare (temporary ) vec4 f@8) (assign (xyzw) (var_ref f@8) (var_ref f) ) (call f16 ((swiz y (var_ref f@8) ))) (assign (xyzw) (var_ref f) (var_ref f@8) ) )) When we really need: (declare (temporary ) float inout_tmp) (assign (x) (var_ref inout_tmp) (swiz y (var_ref f) )) (call f16 ((var_ref inout_tmp) )) (assign (y) (var_ref f) (swiz y (swiz xxxx (var_ref inout_tmp) ))) (declare (temporary ) void void_var) The GLSL IR function inlining code seemed to produce correct code even without this but we need the correct IR for GLSL IR -> NIR to be able to understand whats going on. Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> (cherry picked from commit 76c27e47b90647df047e785d6b3ab5d0d979a1ee) Nominated-by: Matt Turner <matts...@gmail.com> - - - - - 871aea89 by Danylo Piliaiev at 2019-01-31T12:06:17Z glsl: Fix copying function's out to temp if dereferenced by array Function's out variable could be an array dereferenced by an array: func(v[w[i]]); or something more complicated. Copy index in any case. Fixes: 76c27e47b906 ("glsl: Copy function out to temp if we don't directly ref a variable") Signed-off-by: Danylo Piliaiev <danylo.pilia...@globallogic.com> Reviewed-by: Timothy Arceri <tarc...@itsqueeze.com> Reviewed-by: Matt Turner <matts...@gmail.com> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> (cherry picked from commit 0862929bf64222e85e8242824aecf05e494c157c) Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109488 Nominated-by: Matt Turner <matts...@gmail.com> - - - - - 190a79f4 by Emil Velikov at 2019-01-31T20:58:09Z docs: add release notes for 18.3.3 Signed-off-by: Emil Velikov <emil.veli...@collabora.com> - - - - - 30 changed files: - VERSION - bin/.cherry-ignore - bin/get-pick-list.sh - configure.ac - docs/relnotes/18.3.2.html - + docs/relnotes/18.3.3.html - include/GL/internal/dri_interface.h - meson.build - src/amd/common/ac_nir_to_llvm.c - src/amd/vulkan/radv_device.c - src/amd/vulkan/radv_nir_to_llvm.c - src/amd/vulkan/radv_pipeline.c - src/compiler/glsl/ast_function.cpp - src/compiler/glsl/lower_output_reads.cpp - src/compiler/glsl/serialize.cpp - src/compiler/nir/nir_gather_xfb_info.c - src/compiler/nir/nir_opt_copy_prop_vars.c - src/gallium/drivers/etnaviv/etnaviv_context.c - src/gallium/drivers/etnaviv/etnaviv_internal.h - src/gallium/drivers/etnaviv/etnaviv_state.c - src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp - src/gallium/drivers/radeonsi/si_state_draw.c - src/gallium/drivers/radeonsi/si_state_shaders.c - src/gallium/drivers/radeonsi/si_state_viewport.c - src/gallium/drivers/swr/meson.build - src/gallium/drivers/swr/swr_fence.cpp - src/gallium/drivers/vc4/meson.build - src/gallium/drivers/vc4/vc4_tiling_lt.c - src/gallium/include/state_tracker/drisw_api.h - src/gallium/state_trackers/dri/drisw.c The diff was not included because it is too large. View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/compare/95a3b709c0d4618d900f8b8bed429ee4f786fab2...190a79f462710f04d67eaefe498ef6ae5b7f5b1a -- View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/compare/95a3b709c0d4618d900f8b8bed429ee4f786fab2...190a79f462710f04d67eaefe498ef6ae5b7f5b1a You're receiving this email because of your account on salsa.debian.org.
