Mesa (staging/21.1): 55 new commits

Mon May 17 19:02:19 UTC 2021

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c624c0c6ccebe1a9ce1bafcb65c1affd8a52e0ce
Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Mon May 3 14:21:59 2021 +0100

    aco/ra: initialize temp_in_scc earlier

    We need to know if there's a temporary in SCC before the instruction, not
    after.

    Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
    Reviewed-by: Daniel Schürmann <daniel at schuermann.dev>
    Fixes: 93c8ebfa780 ("aco: Initial commit of independent AMD compiler")
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10459>
    (cherry picked from commit 4e459df0fcb42cfb7223e15ffd7e20bcc9b16e75)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4afc5182ec213c70563a57a4a4d520181967740d
Author: Daniel Schürmann <daniel at schuermann.dev>
Date:   Mon May 17 10:39:24 2021 +0200

    aco/ra: also prevent overflow register for p_create_vector operands

    Fixes: d659ce0d6c5781a1230b182ef5ed1a77de485565 ('aco/ra: prevent underflow register for p_create_vector operands')
    Reviewed-by: Tony Wasserka <tony.wasserka at gmx.de>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10832>
    (cherry picked from commit b960169257e42caca23c6e61c72bff7e53df123e)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d8681a0705ad62fe4cf50be814f189309a4d156
Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Fri May 14 09:41:10 2021 +0300

    anv: require rendering support for blit destination feature

    This fixes some new cts tests that exercise blitting
    between compressed and uncompressed formats.

    Cc: mesa-stable
    Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
    Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10830>
    (cherry picked from commit 72fd126070ba749e10f7f58b1dfbb52198fb7eb9)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b233fca1f8a7dd0bf32cc998f7afebf39c0f3d96
Author: James Park <jpark37 at lagfreegames.com>
Date:   Sun May 2 02:24:09 2021 -0700

    vulkan: Support 32-bit "weak" symbols on MSVC

    MSVC uses different decorated names for 32-bit versus 64-bit. Declare
    all argument sizes for 32-bit because computing the actual size would be
    difficult.

    Fixes: 9be7aa3fc83 ("vulkan: Add a common entrypoint table generator")
    Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
    Acked-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10573>
    (cherry picked from commit fb7be7870c258e566f4da6b7d5d0218d717b82c5)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e288e88bcfb7f85987f7d7ee2b8b4e5a3d06d9d5
Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Wed May 12 15:42:44 2021 +1000

    glsl: create validate_component_layout_for_type() helper

    This will be used in the following patch.

    Reviewed-by: Alejandro Piñeiro <apinheiro at igalia.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10763>
    (cherry picked from commit 1a71d6aa6e13179526b41e627f00af25b1612556)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a76a87823049df37ad33db8ddd3b3e966df6b368
Author: Eric Engestrom <eric at engestrom.ch>
Date:   Mon May 17 18:20:37 2021 +0200

    .pick_status.json: Update to 6d56c16c9ceb864af6bb71d0bdcdd21064d94307

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=76fa8c9b417190af52e72dc8ea10e399fbcd8a30
Author: Joshua Ashton <joshua at froggi.es>
Date:   Sat May 15 10:53:17 2021 +0100

    venus: Fix zero-initialized fd causing apps to hang/crash

    Some apps such as Gamescope crash under the mere presence of the virtio Vulkan driver without using a device.

    This is because virtgpu::fd is zero-initialized upon allocation, which causes fd 0 to be closed in virtgpu_destroy.

    Cc: mesa-stable
    Fixes: 247232d5 ("venus: add experimental renderers")
    Signed-off-by: Joshua Ashton <joshua at froggi.es>
    Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
    Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
    Reviewed-by: Daniel Stone <daniels at collabora.com>
    Reviewed-by: Chia-I Wu <olvaffe at gmail.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10814>
    (cherry picked from commit 6fcf3314d00529e2e09fdff1d31332f0d8c0c5cf)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8a1f8951284cd16c5c0e6bc6b8d83de7f0c15054
Author: Joshua Ashton <joshua at froggi.es>
Date:   Sat May 15 14:43:14 2021 +0100

    radv: Handle unnormalized samplers in YCbCr lowering

    We need to divide these by their divisors and special-case COSITED_EVEN.

    Fixes NV12 compositing in Gamescope.

    Fixes: 91702374 ("radv: Add ycbcr lowering pass.")
    Cc: mesa-stable
    Signed-off-by: Joshua Ashton <joshua at froggi.es>
    Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10816>
    (cherry picked from commit 855cb78d4631afeb51291cf1f2f936841d52e8d4)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2528ff1db930ce7d4bbaffef7f5ba9740d92499e
Author: Nanley Chery <nanley.g.chery at intel.com>
Date:   Tue Jan 26 15:50:20 2021 -0800

    iris: Avoid sampling some MCS surfaces with clear

    Supposedly avoids GPU hangs in BF4. See HSD 1707282275 and 14013111325.

    v2. Fix bug in WA implementation. (Sagar)

    Cc: mesa-stable
    Reviewed-by: Sagar Ghuge <sagar.ghuge at intel.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8755>
    (cherry picked from commit bcdebf4ff8f6e1d18e3dd129039a7618907fe8af)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=be005c3d4df94e9b1b50e44341fc3db9327b6c14
Author: Nanley Chery <nanley.g.chery at intel.com>
Date:   Tue Jan 26 15:44:05 2021 -0800

    anv: Avoid sampling some MCS surfaces with clear

    Supposedly avoids GPU hangs in BF4. See HSD 1707282275 and 14013111325.

    v2. Fix bug in WA implementation. (Sagar)

    Cc: mesa-stable
    Reviewed-by: Sagar Ghuge <sagar.ghuge at intel.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8755>
    (cherry picked from commit eef4c708b3fd0af3c641b3d349588e2cfcfcb485)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fe84a36314761887d2d029c2746920c19b85440c
Author: Nanley Chery <nanley.g.chery at intel.com>
Date:   Tue Jan 26 15:42:28 2021 -0800

    anv: Add clear_supported to anv_layout_to_aux_state

    This will be used for an MCS workaround.

    Cc: mesa-stable
    Reviewed-by: Sagar Ghuge <sagar.ghuge at intel.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8755>
    (cherry picked from commit 608c1316389ac3a7a2e118983fb7e434470e4ada)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ef03fd6f993dcf4a876b0cc5e2af889024ae614a
Author: Daniel Schürmann <daniel at schuermann.dev>
Date:   Fri May 14 15:33:02 2021 +0200

    radv: call nir_copy_prop() after load-store vectorization

    The load-store vectorizer can create a large amount
    of unnecessary nir_op_vec and nir_op_mov instructions.
    This prevents nir_opt_move from stalling to much and
    potentially also helps other passes.

    Closes: #4778
    Fixes: 1958381c9ae15dc252bcab8612f39fdca45d4843 ('radv: Reorder some NIR optimizations in preparation for the I/O changes.')
    Reviewed-by: Rhys Perry <pendingchaos02 at gmail.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10804>
    (cherry picked from commit b3eb87aa6547ba2921c1bf2553c6558f99d459c7)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f26514304f2af4d2e1b27441b6ed1a7734e764f8
Author: Daniel Schürmann <daniel at schuermann.dev>
Date:   Fri May 14 11:29:33 2021 +0200

    aco/ra: prevent underflow register for p_create_vector operands

    It could happen that we tested negative out-of-range
    registers for p_create_vector operands resulting in a crash.

    Fixes: 8962510e38fbaff792f60bc17d46507bb77401ac ('aco/ra: Conservatively refactor get_reg_specified to use PhysRegInterval')
    Closes: #4697
    Reviewed-by: Rhys Perry <pendingchaos02 at gmail.com>
    Reviewed-by: Tony Wasserka <tony.wasserka at gmx.de>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10799>
    (cherry picked from commit d659ce0d6c5781a1230b182ef5ed1a77de485565)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5798ecdda92eb01bbf453128c7f66279197c8c6c
Author: Gert Wollny <gert.wollny at collabora.com>
Date:   Sun May 2 14:41:21 2021 +0200

    compiler/nir: check whether var is an input in lower_fragcoord_wtrans

    Otherwise the lowering pass might try to lower any other load from
    a deref if its data.location value happens to be zero.

    Fixes: 418c4c0d7d48a42f475df1ffb93b3a33763e7a4a
      compiler/nir: extend lower_fragcoord_wtrans to support VARYING_SLOT_POS

    Signed-off-by: Gert Wollny <gert.wollny at collabora.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10577>
    (cherry picked from commit e418710f8bd2bc95a863d0a04154d7da37ead7ac)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ee9e5d5fa0cc44da946577347d7af4ac24ba2bdc
Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Wed May 12 17:01:52 2021 -0700

    intel: Add 2 ADL-S pci-ids

    Cc: mesa-stable
    Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
    Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10781>
    (cherry picked from commit df5b14969f9869f363bcc8b2a564c85aaa481597)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7070bbf886b8dd94d66eb7b50d772f9cfc36a58e
Author: Daniel Schürmann <daniel at schuermann.dev>
Date:   Tue May 4 15:30:50 2021 +0200

    driconf: set vk_x11_strict_image_count for Metro: Exodus

    Otherwise, the game crashes on startup under xwayland.

    Closes: #4650
    Cc: mesa-stable
    Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10750>
    (cherry picked from commit c62d58c80f1751766a5702f8cb65dc806ce8fe89)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=dc0d24f7dad23c0a1c9d97d358895d29a07a045e
Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Thu May 13 22:48:15 2021 +0300

    anv: handle spirv parsing failure

    v2: don't leak spec_entries

    v3: Also switch to VK_ERROR_UNKNOWN when parsing fails

    Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    Cc: mesa-stable
    Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10790>
    (cherry picked from commit 938e52a6e83f2851c7cacbf97c5dfd4e1ff6837d)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a1c1c1ce29eae9c371e368e7168d10eb794803b5
Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Thu Jul 9 02:51:07 2020 -0700

    intel/dev: Add device info for ADL GT2

    Cc: mesa-stable
    Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
    Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9465>
    (cherry picked from commit e435511b580287d1fab1b1028b2d36acce80dac9)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=13b2ff1573240607c0bb9fe4be45b1b069a832d6
Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Thu Dec 10 01:42:12 2020 -0800

    intel/isl: Add Wa_22011186057 to disable CCS on ADL GT2 A0

    Cc: mesa-stable
    Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
    Reviewed-by: Nanley Chery <nanley.g.chery at intel.com>
    Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9465>
    (cherry picked from commit 89f33126252e16dac61d4045f38a6eee76db944f)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8ca726ae1d04e9927541790eb18ae428e342ec43
Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Thu May 13 18:14:51 2021 -0400

    lavapipe: fix fencing when submitting multiple cmdbufs

    a fence applies to all the submitted cmdbufs, so it's necessary to do
    the flush which creates the user fence after all the cmdbufs have been
    processed in order to avoid creating a fence that only applies to the
    first cmdbuf

    Fixes: b38879f8c5f ("vallium: initial import of the vulkan frontend")

    Reviewed-by: Dave Airlie <airlied at redhat.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10795>
    (cherry picked from commit cf3f17a64345d59c7f044e9ccd04631b930003d3)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=120ad4b26096f04e92fd49ebe41ba6f22ba1fec4
Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Thu May 13 12:38:46 2021 -0400

    zink: stop overwriting buffer map pointers for stream uploader

    this breaks the driver!

    the uploader always maps its own pointer, so modifying that at any
    point just explodes things later

    Fixes: d179c5d28e6 ("zink: implement threaded context")

    Reviewed-by: Dave Airlie <airlied at redhat.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10787>
    (cherry picked from commit 8e2ac24482d87b10e2619c2de67ae0bfb33e98c4)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e2992b0242f7b8d963d366d0c18a727f7345d039
Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Sat Apr 17 19:59:22 2021 +0300

    anv: fix perf query pass with command buffer batching

    We've only considered the perf query pool change previously. But we
    also need to pay attention to the pass index.

    Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    Fixes: 0a7224f3ff7542 ("anv: group as many command buffers into a single execbuf")
    Reviewed-by: Felix DeGrood <felix.j.degrood at intel.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10301>
    (cherry picked from commit 2cebb1b5b3eb9b2e774aa90f9cbd67106ff8f77c)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f52babe907ffa8ab9f4840779eee324e16de762f
Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Sat Apr 17 18:21:26 2021 +0300

    intel/mi_builder: fix resolve call

    Giving NULL for anv_combine_address() triggers an assert in that
    function.

    Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    Fixes: 8525ebe6e375 ("intel/mi_builder: Return an address from __gen_get_batch_address")
    Reviewed-by: Felix DeGrood <felix.j.degrood at intel.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10301>
    (cherry picked from commit 2c2de4d60efc8bd315374b003d2b7e2c63737002)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a78476b776701b6bb3bcd5f4acc0b7d3a7173e94
Author: Abel García Dorta <mercuriete at gmail.com>
Date:   Wed May 12 18:34:19 2021 +0100

    i915g: add HW atomic counters as unsupported

    Closes: #4772
    Fixes: 2a06423c009 ("gallium: add CAPs to support HW atomic counters. (v3)")
    Reviewed-by: Alyssa Rosenzweig <alyssa at collabora.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10776>
    (cherry picked from commit f88dd7ed4d2d2cac9816bc386064d08e5c4c06e7)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2a0fd5bebbccda32ede59d457e55b70cbac1cbc6
Author: Tony Wasserka <tony.wasserka at gmx.de>
Date:   Fri May 7 16:22:45 2021 +0200

    aco/scheduler: Fix register demand computation for upwards moves

    The initial value needs to be taken from the instruction that is being
    moved over, not the one to be moved.

    Additionally the parameter of this function was removed because it was
    misleading. Setting it to any value other than source_idx would cause
    register_demand to be initialized incorrectly. (Instead, the maximum
    demand among the covered instructions would need to be determined.)

    Reviewed-by: Daniel Schürmann <daniel at schuermann.dev>
    Cc: mesa-stable
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10644>
    (cherry picked from commit 50ba919d37289d1ed9bf2464042eaa0b8e3dbb2e)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b765f7c5ad4de611e9c241be7b77510fd480b7a9
Author: Tony Wasserka <tony.wasserka at gmx.de>
Date:   Wed May 5 12:53:13 2021 +0200

    aco/scheduler: Fix register demand computation for downwards moves

    Previously, changes in total_demand_clause were not always propagated to
    total_demand. For instance, clause moves do not change the local register
    demand at the end of a clause, yet they may still affect the total maximum.

    Reviewed-by: Daniel Schürmann <daniel at schuermann.dev>
    Fixes: 8235bc64112 ("aco: try to group together VMEM loads of the same resource")
    Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4533
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10644>
    (cherry picked from commit c528af10761aa3ea902df269d71b54425c54e877)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3a322a12994a3d0715633ad5d5ba86cc03586ef4
Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Wed May 12 15:19:43 2021 +0300

    isl: require hiz for depth surface in isl_surf_get_ccs_surf

    Fixes: 752eefdb ("intel/isl: Refactor isl_surf_get_ccs_surf")
    Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
    Reviewed-by: Nanley Chery <nanley.g.chery at intel.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10768>
    (cherry picked from commit 343d90b6ab536ce92050035682c072ad1c21b694)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=abd02124ecde41d442e118009fa8839b3603bd49
Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Wed May 12 15:44:02 2021 +1000

    glsl: add missing support for explicit components in interface blocks

    From the ARB_enhanced_layouts spec:

       "As with input layout qualifiers, all shaders except compute shaders
       allow *location* layout qualifiers on output variable declarations,
       output block declarations, and output block member declarations.  Of
       these, variables and block members (but not blocks) additionally
       allow the *component* layout qualifier."

    We previously had compile tests in piglit to make sure this was not a
    compile error but no execution tests.

    Fixes: d99a040bbf2c ("i965: enable ARB_enhanced_layouts for gen8+")

    Reviewed-by: Alejandro Piñeiro <apinheiro at igalia.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10763>
    (cherry picked from commit 5aabc912739a99ddaee482e54b9ca3fc76a092f1)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6e47e0f90f5bab488a1f843fbb5b154748ecc5a9
Author: Eric Engestrom <eric at engestrom.ch>
Date:   Sun May 16 22:14:45 2021 +0200

    .pick_status.json: Update to 0c30ad402d0011c957576681d2aaf9b2e68c318e

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6ba5eb1ecb6be568b3a306b45e355784ca0dc686
Author: Daniel Schürmann <daniel at schuermann.dev>
Date:   Tue May 11 22:58:27 2021 +0200

    aco: fix additional register requirements for spilling

    It could happen that VGPR spilling without SGPR spilling
    calculated a negative spills_to_vgpr number and then
    increasing the VGPR target demand above the limit.

    Cc: mesa-stable

    Reviewed-by: Tony Wasserka <tony.wasserka at gmx.de>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10756>
    (cherry picked from commit 989e9867a64045421cf77c0d0bb2d184408ed21f)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=382ffa60959d14cc5fcc5feae0998a791f4fcb99
Author: Marcin Ślusarz <marcin.slusarz at intel.com>
Date:   Thu Nov 12 20:13:26 2020 +0100

    nir: handle float atomics in nir_lower_memory_model

    Signed-off-by: Marcin Ślusarz <marcin.slusarz at intel.com>
    Reviewed-by: Rhys Perry <pendingchaos02 at gmail.com>
    Fixes: 2adb337256f ("nir,radv/aco: add and use pass to lower make available/visible barriers")
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10766>
    (cherry picked from commit 2c3e2d69bd1e1ab715783f0ef41daf99519ed12e)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=00ede5f163228b218745c6ff14282da651544b84
Author: Eric Engestrom <eric at engestrom.ch>
Date:   Wed May 12 21:39:06 2021 +0200

    .pick_status.json: Update to e8640fef9089bb31a9e602a8894ae4fe84086118

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d25ff22af39e666307538a459e50b6643af0a6a4
Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Tue May 4 15:08:07 2021 -0400

    iris: refcount separate screen objects for resource tracking

    this screen object can never, ever be accessed like this in a resource,
    as it may have previously been replaced by a wrapper (e.g., driver trace)
    which will then explode when it is accessed directly

    instead, keep a separate screen ref on the resource which is known to be
    the actual driver object and not a wrapper

    Fixes: 0a497eb1303 ("iris: make resources take a ref on the screen object")

    Reviewed-by: Lionel Landwerlin lionel.g.landwerlin at intel.com
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10632>
    (cherry picked from commit eb63c7decedb6188122f01d9851c44aa8d1d0e33)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=83e3a129c6be90a53b1953f4b5f3f7666ae301ed
Author: Juan A. Suarez Romero <jasuarez at igalia.com>
Date:   Fri Apr 30 12:49:59 2021 +0200

    v3d: fix resource leak in error path

    Do not leak pipe resource if scanout resource creation fails.

    Fixes: bf6973199d1 ("v3d: Allow the UIF modifier with renderonly.")
    Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
    Signed-off-by: Juan A. Suarez Romero <jasuarez at igalia.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10643>
    (cherry picked from commit 66bf683ca9b5889aa05c32d3e35ea2649bab7d23)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=de9c715784e8f2dcc4188d9d060f94c1611e87e1
Author: Eric Engestrom <eric at engestrom.ch>
Date:   Sun May 9 18:10:32 2021 +0200

    egl/x11: don't forget to exit the attrib list loop

    Without this check, if we receive any attribs from the client, we either
    find an X11/XCB screen fd in there, or we keep going until we end up in
    random bits of memory and crash.

    Fixes: 4aebd86f9a1b0db0ebcc ("egl/x11: pick the user requested screen")
    Signed-off-by: Eric Engestrom <eric at engestrom.ch>
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10717>
    (cherry picked from commit 2af08bf7b69a5f3b8f94b8669f1bff67405ca396)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=96307752bb3322f297e34f3e9e935dc371534ce3
Author: Karol Herbst <kherbst at redhat.com>
Date:   Wed Jan 27 22:09:16 2021 +0100

    clover/memory: fix data race in buffer subclasses

    Cc: mesa-stable
    Signed-off-by: Karol Herbst <kherbst at redhat.com>
    Reviewed-by: Zoltán Böszörményi <zboszor at gmail.com>
    Reviewed-by: Pierre Moreau <dev at pmoreau.org>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8765>
    (cherry picked from commit 98280e834873a0f8711aa489a2a4e256a25566d0)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4ee7244c27aaa46a47d3c21d02c7de3d44fcd58f
Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Sat May 8 12:42:10 2021 +0200

    android: nir: add nir_lower_fragcolor.c to Makefile.sources

    Fixes the following building error:

    FAILED: out/target/product/x86_64/obj/SHARED_LIBRARIES/gallium_dri_intermediates/LINKED/gallium_dri.so
    ...
    ld.lld: error: undefined symbol: nir_lower_fragcolor
    >>> referenced by pan_assemble.c:81 (external/mesa/src/gallium/drivers/panfrost/pan_assemble.c:81)

    Cc: 21.0 21.1 <mesa-stable at lists.freedesktop.org>
    Fixes: 1fd356302590 ("nir: add lowering pass for fragcolor -> fragdata")
    Acked-by: Rob Clark <robclark at freedesktop.org>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10712>
    (cherry picked from commit 2736ae0454d574a1909863d7870fa4f1fe91bd7d)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=79b43881561cfc2341f3ab217f56d654d0c57112
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Fri May 7 18:07:12 2021 +0200

    radv: fix extending the dirty bits to 64-bit

    New dynamic states added for VK_EXT_extended_dynamic_state2 causes
    GPU hangs with vkd3d-proton.

    Fixes: 7bdd569d7e1 ("radv: extend the dirty bits to 64-bit")
    Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
    Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10693>
    (cherry picked from commit 54b0cfb061ec393abdd9cf5bc7f43cb898c8fd4d)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=09890e9cb9f1dfed23381e7b36f4357a3cdafc88
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri May 7 11:26:35 2021 +1000

    gallivm: handle texture arrays in non-fragment shaders with lod.

    We have to unwind the lod into the scalar path correctly.

    Fixes a crash with renderdoc demo

    Fixes: e168d148d76d ("gallivm/nir: handle non-uniform texture offsets")
    Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10676>
    (cherry picked from commit 83a05caaf2ce4fa9d6605eddd5658bf400f642fb)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4f99759370e926df9e9fbb97e55e9e20da56f911
Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Tue May 4 08:31:38 2021 +0200

    Revert "gallium/util: Fix depth/stencil blit shaders"

    This reverts commit 7ca72f172678116d29d254b786a9422b864aef3d.
    Unlike what's stated in this commit, the depth or stencil components
    have to be replicated on all channels, as specified in the
    "Texture Sampling and Texture Formats" section of the TGSI doc
    (docs/gallium/tgsi.rst).

    Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10649>
    (cherry picked from commit 6cac9c748eb81105b5cd7df32060ee8aae2b1e5f)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c3ec53a123a41a9b0789d735d68d35635713396
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Mon May 3 17:56:27 2021 +0200

    radv: fix missing ITERATE_256 for D/S MSAA images that are TC-compat HTILE

    To make them readable by shaders, only needed on GFX10+.

    This also fixes corruption with Control and MSAA.

    Cc: 21.1 mesa-stable
    Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
    Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10610>
    (cherry picked from commit 33ede796d5b9149076738b031137b4389dab71a1)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7ccaf8092093f396ff0c67f49820debbb5d013f2
Author: Eric Engestrom <eric at engestrom.ch>
Date:   Tue May 11 22:42:55 2021 +0200

    .pick_status.json: Update to 584145ea882b710027ce620a5d505bd25ab284b1

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b125ee559a3d733c25848a3b525a15100e054ee8
Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Mon Apr 26 12:29:30 2021 -0700

    bin/pick: Rename master branch to main

    Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
    Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
    Reviewed-by: Eric Engestrom <eric at engestrom.ch>
    (cherry picked from commit 6e86d1f503d8b017bd6679a4db70fef532595f65)

    [Eric: botched up Jordan's commit to not break anything on the release branch]

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=da315007b815076498ef2bdf28000d25b14dd91a
Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Tue May 4 13:04:48 2021 +0200

    gallium/u_vbuf: avoid dereferencing NULL pointer

    When I last time fixed this, I missed that continuing here would make us
    leak pointers in the translate state, which is what made this avoid a
    crash in the first place.

    That's not great, we need to set *some* pointer in this case. The
    obvious option would be NULL, but that means that the translate-code
    also needs to support NULL-pointers here.

    Instead, let's point to a small, static buffer that contains enough
    zero-data for the largest possible vertex attribute. This avoids having
    to add more NULL-checks.

    Fixes: a8e8204b186 ("gallium/u_vbuf: support NULL-resources")
    Reviewed-by: Marek Olšák <marek.olsak at amd.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7773>
    (cherry picked from commit a2d091694f8cf30f7f8a15d9c26712d4e56eaa6c)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fb696bbbe268f5642c81328879c42963ad699be7
Author: Danylo Piliaiev <dpiliaiev at igalia.com>
Date:   Mon Feb 15 15:53:46 2021 +0200

    ir3: memory_barrier also controls shared memory access order

    nir_intrinsic_memory_barrier has the same semantic as memoryBarrier()
    in GLSL, which is:

    GLSL 4.60, 4.10. "Memory Qualifiers":
     "The built-in function memoryBarrier() can be used if needed to
     guarantee the completion and relative ordering of memory accesses
     performed by a single shader invocation."

    GLSL 4.60, 8.17. "Shader Memory Control Functions":
     "The built-in functions memoryBarrier() and groupMemoryBarrier() wait
     for the completion of accesses to all of the above variable types."

    Fixes tests:
     dEQP-VK.memory_model.message_passing.core11.u32.coherent.fence_fence.atomicwrite.device.payload_local.image.guard_nonlocal.workgroup.comp
     dEQP-VK.memory_model.message_passing.core11.u32.coherent.fence_fence.atomicwrite.device.payload_nonlocal.workgroup.guard_local.image.comp

    Fixes: 819a613a ("freedreno/ir3: moar better scheduler")

    Signed-off-by: Danylo Piliaiev <dpiliaiev at igalia.com>
    Reviewed-by: Samuel Iglesias Gonsálvez <siglesias at igalia.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9054>
    (cherry picked from commit cb8a00791cc9618f5be903c31abf737b42e4cf46)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ceafcf3daf20763795bda6a9f166443bd84b7bf4
Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Thu Apr 22 13:46:41 2021 +0200

    docs: do not generate redirects on error

    The build-finished event is also triggered when there's an error. I
    somehow got the second argument wrong, and ended up ignoring the case.
    This can lead to new exceptions being thrown due to missing files, that
    ends up hiding the real problem.

    Fixes: 64a4ba9e1ce ("docs: add an extension to generate redirects")
    Reviewed-by: Eric Engestrom <eric at engestrom.ch>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10407>
    (cherry picked from commit 2736370294427d87933ce7ae293e0465fbab77e2)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=db3c2cdf824bba166c453743b2892274a4e8a0e3
Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed Apr 28 17:19:43 2021 -0400

    Revert "gallium/u_threaded: align batches and call slots to 16 bytes"

    This reverts commit 3b1ce49bc1e5aff87805b0bab255885c84bf5052.

    It will be completely rewritten, but let's revert this first.

    Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.eric.pelloux-prayer at amd.com>
    Acked-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10606>
    (cherry picked from commit 954f59f2af4a135f2af2d2b6e341b4332ad3cccd)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bb746def48d6ba0aa875d97b62685e39bad80dae
Author: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
Date:   Thu Apr 29 12:10:13 2021 -0700

    nir: Move shared_memory_explicit_layout bit into common shader_info

    Move it out of the "cs" sub-struct, since the bit can be used for
    other shader stages in the future.

    This also removes a subtle issue in spirv_to_nir:
    info.cs.shared_memory_explicit_layout was used without checking for
    the CS shader stage.  It ended up being "harmless" since the effects
    also depended on presence of shared variables.

    Fixes: 5de6c5973a6 ("spirv: Implement SPV_KHR_workgroup_memory_explicit_layout")
    Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10529>
    (cherry picked from commit dd48683cfd6daf07602b7e92b96baf3704489fd7)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2ceb11aaa837f609626cfab5497d5adb4e49c7b7
Author: Connor Abbott <cwabbott0 at gmail.com>
Date:   Fri Apr 30 18:05:37 2021 +0200

    freedreno/a6xx: Fix SP_GS_PRIM_SIZE for large sizes

    This fixes a few piglit hangs.

    Fixes: 0eebedb ("freedreno/a6xx: Emit program state for GS")
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10551>
    (cherry picked from commit e7b7908f87a437b3d4a239bf9f2119154967757e)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1947597f748a7c243d41a5a416139f09ff7bb936
Author: Eric Engestrom <eric at engestrom.ch>
Date:   Mon May 10 19:43:26 2021 +0200

    .pick_status.json: Update to a1c56b80915a1105c5a62aa6ff3ac71c1edd143d

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f08e0a2016bf40c055df360a1c3b745ec8b463d0
Author: Dylan Baker <dylan.c.baker at intel.com>
Date:   Wed Apr 28 16:14:58 2021 -0700

    meson/vulkan: fix linkage on windows

    The current approach likley breaks icl and clang-cl, but it seems that
    the problem isn't even really related to MSVC, but to Meson's Visual
    Studio backend, as such, let's use link-whole unless we're using a
    Visual Studio backend.

    Fixes: 48d31a6280c4de07279435606a5c0524c1787cad
           ("meson: link vulkan_util with link_whole on mingw")

    Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
    Acked-by: James Park <jpark37 at lagfreegames.com>
    (cherry picked from commit f03da01fe374b87b5144c77f56ab78cf7c2a2ed3)

    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10379>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c51a8d12734e3ed05d0c02713f7452bccad8622e
Author: Michel Zou <xantares09 at hotmail.com>
Date:   Sun Apr 18 15:44:58 2021 +0200

    meson: link vulkan_util with link_whole on mingw

    It was missing for mingw.

    Closes #4633

    Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
    Acked-by: James Park <jpark37 at lagfreegames.com>
    (cherry picked from commit 48d31a6280c4de07279435606a5c0524c1787cad)

    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10379>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=62e4fe2300fc92514d13df9281045e8bdbe8377d
Author: Michel Zou <xantares09 at hotmail.com>
Date:   Thu Apr 15 22:38:24 2021 +0200

    vulkan: fix duplicate win32 def

    Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
    (cherry picked from commit dc036b17695318cd9c7f8e3376c017e896c2d1b1)

    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10379>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7257be4d7020c35598ad139469ba2e805cfea59b
Author: Michel Zou <xantares09 at hotmail.com>
Date:   Thu Apr 15 22:37:58 2021 +0200

    lavapipe: fix unused variable warning

    Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
    (cherry picked from commit 45f32ce239bcc756c9720896d12bc02d9e6cdc50)

    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10379>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0fff844cf9de27fbee548f16e67a78180a9b9412
Author: Michel Zou <xantares09 at hotmail.com>
Date:   Thu Apr 15 22:38:44 2021 +0200

    gallium: fix uninitialized variable warning

    Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
    (cherry picked from commit 54deb1010f7db2a1d73557194557ab0ac851b30f)

    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10379>