Timo Aaltonen pushed to branch upstream-unstable at X Strike Force / lib / mesa
Commits: eaa71b8b by Dylan Baker at 2021-10-28T10:42:02-07:00 docs: add sha256 sums for 21.2.5 - - - - - 5e05d43e by Dylan Baker at 2021-10-29T09:09:58-07:00 .pick_status.json: Update to 8bfa146b8056d5dded6fdd2c4d8524aa0c438058 - - - - - c0a49bc4 by Mike Blumenkrantz at 2021-10-29T09:10:06-07:00 zink: add better handling for CUBE_COMPATIBLE bit this check was illegal because the usage bits weren't yet populated, so add another check after usage bits are determined to figure out if CUBE_COMPATIBLE can be applied additionally, checking sample counts was never needed since the spec prohibits CUBE_COMPATIBLE use with multisampling zink DEBUG: ERR: 'Validation Error: [ VUID-vkGetPhysicalDeviceImageFormatProperties-usage-requiredbitmask ] Object 0: VK_NULL_HANDLE, type = VK_OBJECT_TYPE_DEVICE; | MessageID = 0x991b3105 | vkGetPhysicalDeviceImageFormatProperties: value of usage must not be 0. The Vulkan spec states: usage must not be 0 (https://www.khronos.org/registry/vulkan/specs/1.2-extensions/html/vkspec.html#VUID-vkGetPhysicalDeviceImageFormatProperties-usage-requiredbitmask)' Fixes: 71494c4874c ("zink: only mark resources as cube-compatible if supported") Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12580> (cherry picked from commit 2de6beaa12f9b855d31c3c11a8a6cea51a14d6b1) - - - - - b84542fe by Mike Blumenkrantz at 2021-10-29T09:10:10-07:00 zink: always use explicit lod for texture() when legal in non-fragment stages implicit lod is something else entirely fixes #5566 cc: mesa-stable Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13563> (cherry picked from commit 3ad06b69490fa990c473e16f78ce658b0eb43b47) - - - - - e8fd3214 by Danylo Piliaiev at 2021-10-29T09:10:11-07:00 ir3/ra: Check register file upper bound when updating preferred_reg Otherwise we could get invalid reg in get_reg() Would fix many dEQP-VK.ssbo.phys.layout.* Fixes: 0ffcb19b9d9fbe902224542047c389a661fbf816 "ir3: Rewrite register allocation" Signed-off-by: Danylo Piliaiev <dpilia...@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13546> (cherry picked from commit aa264ded948defc88930eea7d54800b3188a3ac0) - - - - - ace310e9 by Kenneth Graunke at 2021-10-29T09:10:11-07:00 iris: Fix MOCS for buffer copies We were passing a MOCS of 0, which is uncached. Yikes. Fixes: c5b22441f1c ("iris: Fix buffer -> buffer copy_region") Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13480> (cherry picked from commit d8cb76211c5d264d705dbd3c02b5fc61637d5a56) - - - - - 0c95b321 by Greg V at 2021-10-29T09:10:12-07:00 util: make util_get_process_exec_path work on FreeBSD w/o procfs sysctl is the correct way of getting the current executable's path. procfs is not mounted by default. Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Reviewed-by: Eric Engestrom <e...@engestrom.ch> Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1598> (cherry picked from commit 98dbd01a96fd1d715794c0fe8ad82392882a8129) - - - - - a5bddea1 by Marek Olšák at 2021-10-29T09:10:13-07:00 radeonsi: print the border color error message only once Cc: 21.2 21.3 <mesa-sta...@lists.freedesktop.org> Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-pra...@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13590> (cherry picked from commit 8bfa146b8056d5dded6fdd2c4d8524aa0c438058) - - - - - 4062477c by Dylan Baker at 2021-11-01T10:02:50-07:00 .pick_status.json: Update to 79f57f68930ce4fcf59bdca82357e19b4f3d62e6 - - - - - 5cd36b4f by Mike Blumenkrantz at 2021-11-01T10:02:53-07:00 zink: be more permissive for injecting LOD into texture() instructions there's other variants of implicit lod sampling, and none of them are valid outside fragment stage Fixes: 3ad06b69490 ("zink: always use explicit lod for texture() when legal in non-fragment stages") Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13585> (cherry picked from commit 87fbb0eab03c8348f74ca1f4b3489e89e89f691f) - - - - - aa0ac4d3 by Mike Blumenkrantz at 2021-11-01T10:02:54-07:00 zink: inject LOD for sampler version of OpImageQuerySize this is required by spec cc: mesa-stable Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13585> (cherry picked from commit e8f18385e05db6d14ae6807a529c5d69c38d6091) - - - - - 764b302e by Mike Blumenkrantz at 2021-11-01T10:03:03-07:00 zink: don't clamp cube array surfacess to cubes this was probably necessary for some other reason that has since been fixed, and instead now just creates validation spam cc: mesa-stable fixes #5566 Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13586> (cherry picked from commit 8d2280f533faf5e372d604cf35b355b898423375) - - - - - 9ff1f615 by Mike Blumenkrantz at 2021-11-01T10:03:04-07:00 zink: don't clamp 2D_ARRAY surfaces to 2D another thing that used to be needed but now isn't cc: mesa-stable Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13586> (cherry picked from commit aa5e544644431e9d4462b6f46208a3c028a1a13d) - - - - - 15011982 by Mike Blumenkrantz at 2021-11-01T10:30:23-07:00 zink: add more int/float types to cast switching in ntv these come from opcode results, which are not always 32bit cc: mesa-stable Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13562> (cherry picked from commit c73f5a00826201f6e76854145aa823cec4f389d2) - - - - - c95f5ba4 by Mike Blumenkrantz at 2021-11-01T10:30:23-07:00 zink: force float dest types on some alu results these aren't exact matches in spirv, so set the expected result type to float where necessary cc: mesa-stable fixes #5567 Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13562> (cherry picked from commit 73af67883ddf6faec9c0e76f8c174fb450817179) - - - - - 123cff21 by Dylan Baker at 2021-11-03T13:06:40-07:00 .pick_status.json: Update to c356f3cfce9459dc1341b6a2a0fd5336a9bdcc3c - - - - - 1a1536cc by Vadym Shovkoplias at 2021-11-03T13:06:43-07:00 intel/fs: Fix a cmod prop bug when cmod is set to inst that doesn't support it Fixes dEQP-VK.reconvergence.*nesting* tests. There are cases when cmod is set to an instruction that cannot have conditional modifier. E.g. following: find_live_channel(32) vgrf166:UD, NoMask cmp.z.f0.0(32) null:D, vgrf166+0.0<0>:D, 0d is optimized to: find_live_channel.z.f0.0(32) vgrf166:UD, NoMask v2: - Add unit test to check cmod is not set to 'find_live_channel' (Matt Turner) - Update flag_subreg when conditonal_mod is updated (Ian Romanick) Signed-off-by: Vadym Shovkoplias <vadym.shovkopl...@globallogic.com> Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5431 Fixes: 32b7ba66b01 ("intel/compiler: fix cmod propagation optimisations") Reviewed-by: Matt Turner <matts...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13268> (cherry picked from commit 2dbb66997e2e2ab0a07a84a40df70d8d75fe2524) - - - - - 59166242 by Jesse Natalie at 2021-11-03T13:06:44-07:00 util/hash_table: Clear special 0/1 entries for u64 hash table too Fixes: e532a47f ("util/hash_table: do not leak u64 struct key") Reviewed-by: Emma Anholt <e...@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13390> (cherry picked from commit ffd4157b1caa69345468bbbe914e2bb64a4ddbaa) - - - - - dc1fb023 by Dylan Baker at 2021-11-24T15:47:18-08:00 .pick_status.json: Mark a large number of zink patches as denominated - - - - - 809dee45 by Dylan Baker at 2021-11-24T15:47:18-08:00 .pick_status.json: Update to 78b613db23c10dc257247d99d8b2b1ef6c96bebb - - - - - 5537232f by Mike Blumenkrantz at 2021-11-24T15:47:19-08:00 aux/primconvert: handle singular incomplete restarts if no restart indices are found, this draw must be discarded to avoid crashing later on Fixes: 583070748cb ("util/primconvert: handle rewriting of prim-restart draws with unsupported primtype") Reviewed-by: Jesse Natalie <jenat...@microsoft.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13630> (cherry picked from commit bc345281ab95313c2e34fffbd993bd1fbfc016be) - - - - - 8c9d526a by Pierre-Eric Pelloux-Prayer at 2021-11-24T15:47:19-08:00 radeonsi: treat nir_intrinsic_load_constant as a VMEM operation This is used by variable indexing of constant arrays, to build code like this: s_add_u32 s6, s6, const_data@rel32@lo+4 s_addc_u32 s7, s7, const_data@rel32@hi+12 [...] global_load_dword v4, v4, s[6:7 Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5118 Fixes: 8288882965b ("radeonsi: set MEM_ORDERED optimally") Reviewed-by: Marek Olšák <marek.ol...@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13550> (cherry picked from commit dc56301f78494bea67f0c57d5aa77fef42bfe455) - - - - - b3ed6626 by Pierre-Eric Pelloux-Prayer at 2021-11-24T15:47:19-08:00 ac/surface: don't validate DCC settings if DCC isn't possible Cc: mesa-stable Reviewed-by: Marek Olšák <marek.ol...@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13550> (cherry picked from commit dbf602a6b39833c4cdc4b6769ec40ab384fd8bcb) - - - - - 7c85d4fb by Mike Blumenkrantz at 2021-11-24T15:47:19-08:00 zink: clamp PIPE_SHADER_CAP_MAX_INPUTS for xfb vertex shader stages that can produce xfb must have their input size clamped to the compiler define MAX_VARYING to successfully be able to export an xfb output for each input fixes KHR-GL46.geometry_shader.limits.max_input_components cc: mesa-stable Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13632> (cherry picked from commit 5d1b81d8ac9cab3f9213b7d19ac2f3035cf60a3c) - - - - - 07dcfc38 by Marek Olšák at 2021-11-24T15:47:19-08:00 radeonsi: fix 2 issues with depth_cleared_level_mask - Unset depth_cleared_level_mask for non-clear blits. Set the flag after the clear, so that we don't have to check blitter_running. - Set depth_cleared_level_mask only when we set depth_clear_value. Fixes: ff8a930cf7de6aa7 - radeonsi: add _once suffix to depth_cleared_level_mask Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-pra...@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13603> (cherry picked from commit 5d3aea49b806322393c3275d550f4e4eaef3cca3) - - - - - 712ab9c3 by Marek Olšák at 2021-11-24T15:47:19-08:00 radeonsi: fix a typo preventing a fast depth-stencil clear Fixes: 9defe8aca953b69615728c8 - radeonsi: implement fast Z/S clears using clear_buffer on HTILE Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-pra...@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13603> (cherry picked from commit 74adf22a0aeeaf5f63748394d2da0337b04b1526) - - - - - 4b0b826e by Pierre-Eric Pelloux-Prayer at 2021-11-24T15:47:19-08:00 mesa: always call _mesa_update_pixel 10c75ae4 moved handling of this state to the functions that depend on ctx->_ImageTransferState. So we can't depend on _NEW_PIXEL being set to call this function, since it'll be always clear earlier by _mesa_update_state_locked. Example sequence that would trigger the issue: glPixelTransferi(...) glClear(...) glTexSubImage2D(...) <-- won't use the new value set by glPixelTransferi because glClear caused _NEW_PIXEL to be cleared. _NEW_PIXEL itself is kept because st_update_pixel_transfer depends on it. Fixes: 10c75ae4 ("mesa: move _mesa_update_pixel out of _mesa_update_state") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5273 Reviewed-by: Marek Olšák <marek.ol...@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13596> (cherry picked from commit 1ee3fbd703752460248958f9b7e42a855023b274) - - - - - 20fa3788 by Lionel Landwerlin at 2021-11-24T15:47:19-08:00 intel/dev: fix HSW GT3 number of subslices in slice1 Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Cc: <mesa-sta...@lists.freedesktop.org> Reviewed-by: Francisco Jerez <curroje...@riseup.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10015> (cherry picked from commit d1db5d562af6cd9447bb564797d67dd27ff95024) - - - - - bd7deb06 by Lionel Landwerlin at 2021-11-24T15:47:19-08:00 intel/dev: don't forget to set max_eu_per_subslice in generated topology Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Cc: <mesa-sta...@lists.freedesktop.org> Reviewed-by: Francisco Jerez <curroje...@riseup.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10015> (cherry picked from commit d7c6a90c26794eff623e8885f92ab27aaa0fe581) - - - - - fdc53e0a by Lionel Landwerlin at 2021-11-24T15:47:19-08:00 intel/perf: fix perf equation subslice mask generation for gfx12+ v2: Fix comment change (Marcin) Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Cc: <mesa-sta...@lists.freedesktop.org> Reviewed-by: Francisco Jerez <curroje...@riseup.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10015> (cherry picked from commit 67619d8153249e2cc3c36ac9a28aec9ded0ca1ba) - - - - - ca5a3143 by Lionel Landwerlin at 2021-11-24T15:47:19-08:00 intel/devinfo: fix wrong offset computation A bit difficult to find what commit introduced the issue because of all the renaming, but it was my bug :) Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Cc: mesa-stable Reviewed-by: Francisco Jerez <curroje...@riseup.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10015> (cherry picked from commit 349bfb72752981c9ce276147efaa65ea9d839c57) - - - - - 2c77e8f2 by Dylan Baker at 2021-11-24T15:47:19-08:00 .pick_status.json: Update to 09bb4dbe60b1bb233c5c0102446ffbc142a29246 - - - - - f1087928 by Marek Olšák at 2021-11-24T15:47:19-08:00 driconf: disallow 10-bit pbuffers for viewperf2020/maya due to X errors Cc: 21.2 21.3 <mesa-sta...@lists.freedesktop.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13472> (cherry picked from commit 10ee261c38cbb0c7f0637a039ac2ec3a1ca64c5b) - - - - - 8fcbcbcd by Lionel Landwerlin at 2021-11-24T15:47:19-08:00 intel: remove 2 preproduction pci-id for ADLS Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Fixes: d399c3e861a7c4 ("intel/dev: Add device info for ADL-S") Reviewed-by: Jordan Justen <jordan.l.jus...@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13476> (cherry picked from commit 3b1a5b8f2ba15dfec24b80fcb3f005084c03289e) - - - - - ee5a381b by Dylan Baker at 2021-11-24T15:47:19-08:00 .pick_status.json: Update to e0de7aa4d7717bbd79bbc5bfc660f941f680402b - - - - - cd8a3665 by Eric Engestrom at 2021-11-24T15:47:19-08:00 meson: drop duplicate addition of surfaceless & drm to the list of platforms This is already done on lines 475-480, resulting in them appearing twice in the summary. Fixes: 47946855f19cc7d082fd ("meson: allow egl_native_platform to be specified") Signed-off-by: Eric Engestrom <e...@engestrom.ch> Reviewed-by: Adam Jackson <a...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13278> (cherry picked from commit 9ad375bdcd3189be9672ea42268dec123ffca7fb) - - - - - 7d6a3ca9 by Jason Ekstrand at 2021-11-24T15:47:19-08:00 anv: Fix FlushMappedMemoryRanges for odd mmap offsets When the client calls vkMapMemory(), we have to align the requested offset down to the nearest page or else the map will fail. On platforms where we have DRM_IOCTL_I915_GEM_MMAP_OFFSET, we always map the whole buffer. In either case, the original map may start before the requested offset and we need to take that into account when we clflush. Cc: mesa-sta...@lists.freedesktop.org Reviewed-by: Paulo Zanoni <paulo.r.zan...@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13610> (cherry picked from commit 90ac06e5029b9f0c702c92e97696c9cdb97b08d6) - - - - - 4cf2f780 by Jesse Natalie at 2021-11-24T15:47:19-08:00 d3d12: Fix Linux fence wait return value zero is for success, nonzero is failure. Fixes: 0b60d6a2 ("d3d12: Support Linux eventfds for fences") Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12268> (cherry picked from commit accd8326c5cb78788f12e3066bb6654595c23a51) - - - - - 0f4b2413 by pal1000 at 2021-11-24T15:47:19-08:00 aco: Work around MSVC restrict in c99_compat.h Future LLVM header leads to __declspec(__restrict), which is invalid. Just undefine the restrict macro to keep __declspec(restrict). Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> (cherry picked from commit e0de7aa4d7717bbd79bbc5bfc660f941f680402b) # Conflicts: # src/amd/compiler/aco_print_asm.cpp Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13813> - - - - - c2e89970 by Dylan Baker at 2021-11-24T15:47:19-08:00 .pick_status.json: Update to f8009d3db25512b5dc62d0272c979fb79f8c7075 - - - - - f1cc4c5d by Timur Kristóf at 2021-11-24T15:47:19-08:00 aco: Fix how p_is_helper interacts with optimizations. p_is_helper doesn't have any operands, so ACO's value numbering and/or the pre-RA optimizer could incorrectly recognize two such instructions as the same. This patch adds exec as an operand to p_is_helper in order to achieve correct behavior. Cc: mesa-stable Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5570 Signed-off-by: Timur Kristóf <timur.kris...@gmail.com> Reviewed-by: Daniel Schürmann <dan...@schuermann.dev> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13577> (cherry picked from commit d80c7f3406b80ae684a709de57a9ef3d54a497b6) - - - - - 0422749d by Dave Airlie at 2021-11-24T15:47:19-08:00 llvmpipe: disable 64-bit integer textures. This fixes some crashes in VK-GL-CTS where it doesn't deal with these.. Cc: mesa-stable Reviewed-by: Roland Scheidegger <srol...@vmware.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13617> (cherry picked from commit 53a8faafc1eb28399509098ee2c0fd210f0727f2) - - - - - d2f9a0e4 by Dave Airlie at 2021-11-24T15:47:19-08:00 llvmpipe: fix compressed image sizes. VK CTS just added some new tests to write to a compressed image from a compute shader, which was overrunning memory. The image width/height need to be sized according to the block sizes to avoid overwriting memory. dEQP-VK.image.sample_texture.*bit_compressed* Cc: mesa-stable Reviewed-by: Roland Scheidegger <srol...@vmware.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13618> (cherry picked from commit 27903abbb67482e2d772c508e9d00e49029b8364) - - - - - ecbaa573 by Timothy Arceri at 2021-11-24T15:47:19-08:00 mesa: fix buffer overrun in SavedObj texture obj array Fixes: 3be42f9ca19d ("mesa: rewrite glPushAttrib/glPopAttrib to get rid of malloc") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5621 Reviewed-by: Ilia Mirkin <imir...@alum.mit.edu> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13773> (cherry picked from commit 9d9de15a020d317d4486124f97b2cf06b98ee8b6) - - - - - 281f3d3e by Ian Romanick at 2021-11-24T15:47:19-08:00 glsl/nir: Don't build soft float64 when it cannot be used Fixes: 82d9a37a59c ("glsl/nir: Add a shared helper for building float64 shaders") Closes: #5556 Reviewed-by: Matt Turner <matts...@gmail.com> Reviewed-by: Tapani Pälli <tapani.pa...@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13828> (cherry picked from commit 04f5c543ded15362dc6286ff4ae7a38f00f6ca7e) - - - - - b3afa6e7 by Connor Abbott at 2021-11-24T15:47:19-08:00 ir3/lower_pcopy: Fix shr.b illegal copy lowering The immediate shouldn't be half-reg because the other source isn't. Fixes an assertion failure with dEQP-VK.ssbo.phys.layout.random.16bit.scalar.35. Fixes: 0ffcb19b9d9 ("ir3: Rewrite register allocation") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13818> (cherry picked from commit 65da866ad96bbe5a1683c98191331827ea3bd580) - - - - - d87dbff0 by Connor Abbott at 2021-11-24T15:47:19-08:00 ir3/lower_pcopy: Fix bug with "illegal" copies and swaps If the source and destination were within the same full register, like hr90.x and hr90.y (which both map to r45.x), then we'd perform the swap/copy with the wrong register. This broke dEQP-VK.ssbo.phys.layout.random.16bit.scalar.35 once BDA is enabled. Fixes: 0ffcb19b9d9 ("ir3: Rewrite register allocation") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13818> (cherry picked from commit c98adc56f4fe08231b0fec84b6a92c89eb94d59b) - - - - - 267ffbcc by Lionel Landwerlin at 2021-11-24T15:47:19-08:00 intel/fs: fix shader call lowering pass Now that we removed the intel intrinsic and just use the generic one, we can skip it in the intel call lowering pass and just deal with it in the intel rt intrinsic lowering. v2: rewrite with nir_shader_instructions_pass() (Jason) v3: handle everything in switch (Jason) Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Fixes: 423c47de991643 ("nir: drop the btd_resume_intel intrinsic") Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12113> (cherry picked from commit c5a42e401036eb2eecf8798c103f8ae2cce08eab) - - - - - d8ec092e by Rhys Perry at 2021-11-24T15:47:19-08:00 aco/spill: use spills_entry instead of spills_exit to kill linear VGPRs If a predecessor has only spilled constants (no temporaries), spills_exit will be empty. fossil-db (Sienna Cichlid): Totals from 2 (0.00% of 128647) affected shaders: Latency: 139106 -> 139104 (-0.00%) Signed-off-by: Rhys Perry <pendingchao...@gmail.com> Reviewed-by: Daniel Schürmann <dan...@schuermann.dev> Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5633 Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13821> (cherry picked from commit cc2894345f1161fcbb2f9b9150257e0f6b0b303e) - - - - - 8374d579 by Roman Stratiienko at 2021-11-24T15:47:19-08:00 android.mk: Add missing variables to the make target Android build system may use different internal variables to specify cflags/cppflags. Small change in product confguration may force Android to use diffrent set of variables, therefore we should keep all of them attached to the make rule's target. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5549 Fixes: 8621bd8d5e67 ("android: Add scripts to build using meson") Signed-off-by: Roman Stratiienko <r.stratiie...@gmail.com> Acked-by: Jesse Natalie <jenat...@microsoft.com> Reviewed-by: Marijn Suijten <marijn.suij...@somainline.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13914> (cherry picked from commit 32ec0fffa6fbe58b0fd76901c6a7dc8a9cfc79b1) - - - - - 9c7982e4 by Thomas H.P. Andersen at 2021-11-24T15:47:19-08:00 svga: fix bitwise/logical and mixup The function need_temp_reg_initialization looks suspecious. It will only ever return true if we get past this if: if (!(emit->info.indirect_files && (1u << TGSI_FILE_TEMPORARY)) ... Using the logical && means the intended initialization done based on the result of this check is not performed. This code was both introduced and altered in MR 5317. ccb4ea5a introduces the function. ba37d408 is a collection of performance improvements and misc fixes. This altered the if from using bitwise to logical and. This commit changes it back to bitwise. Spotted from a compile warning. Fixes: ba37d408da3 ("svga: Performance fixes") Reviewed-by: Zoltán Böszörményi <zbos...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12157> (cherry picked from commit 64292c0f05ba891d9c7319e1a1cea98eb0630af4) - - - - - e36e2953 by Rhys Perry at 2021-11-24T15:47:19-08:00 spirv: run nir_copy_prop before nir_rematerialize_derefs_in_use_blocks_impl spirv_to_nir sometimes wraps derefs in vec2 or mov instructions as part of its texture handling. These get in the way of nir_rematerialize_derefs_in_use_blocks_impl. Running copy propagation should get rid of the extra move instructions and get us back to intact deref chains for everything except variable pointer use-cases. fossil-db (Sienna Cichlid): Totals from 6 (0.00% of 134572) affected shaders: CodeSize: 92656 -> 93088 (+0.47%) Instrs: 17060 -> 17138 (+0.46%) Latency: 224408 -> 227539 (+1.40%) InvThroughput: 37402 -> 37924 (+1.40%) VClause: 408 -> 402 (-1.47%) Copies: 1065 -> 1107 (+3.94%) Signed-off-by: Rhys Perry <pendingchao...@gmail.com> Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5668 Fixes: 14a12b771d0 ("spirv: Rework our handling of images and samplers") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13924> (cherry picked from commit b4251007810bc2a02d44580b04ad34ec381f891b) - - - - - ff235ce3 by Dylan Baker at 2021-11-24T15:47:39-08:00 docs: add release notes for 21.2.6 - - - - - bc7160c0 by Dylan Baker at 2021-11-24T15:47:41-08:00 VERSION: bump for 21.2.6 - - - - - 30 changed files: - .pick_status.json - VERSION - android/mesa3d_cross.mk - docs/relnotes/21.2.5.rst - + docs/relnotes/21.2.6.rst - include/pci_ids/iris_pci_ids.h - meson.build - src/amd/common/ac_surface.c - src/amd/compiler/aco_instruction_selection.cpp - src/amd/compiler/aco_print_asm.cpp - src/amd/compiler/aco_spill.cpp - src/compiler/glsl/glsl_to_nir.cpp - src/compiler/nir/nir.h - src/compiler/nir/nir_opt_copy_propagate.c - src/compiler/spirv/vtn_cfg.c - src/freedreno/ir3/ir3_lower_parallelcopy.c - src/freedreno/ir3/ir3_ra.c - src/gallium/auxiliary/indices/u_primconvert.c - src/gallium/drivers/d3d12/d3d12_fence.cpp - src/gallium/drivers/iris/iris_blit.c - src/gallium/drivers/llvmpipe/lp_screen.c - src/gallium/drivers/llvmpipe/lp_setup.c - src/gallium/drivers/llvmpipe/lp_state_cs.c - src/gallium/drivers/llvmpipe/lp_state_sampler.c - src/gallium/drivers/radeonsi/si_clear.c - src/gallium/drivers/radeonsi/si_pipe.h - src/gallium/drivers/radeonsi/si_shader_nir.c - src/gallium/drivers/radeonsi/si_state.c - src/gallium/drivers/radeonsi/si_state_draw.cpp - src/gallium/drivers/svga/svga_tgsi_vgpu10.c The diff was not included because it is too large. View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/-/compare/d1529993454aa28b0f80ee1108bd28421ba07b60...bc7160c0255b902cbe030af5b6475affe5faf3be -- View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/-/compare/d1529993454aa28b0f80ee1108bd28421ba07b60...bc7160c0255b902cbe030af5b6475affe5faf3be You're receiving this email because of your account on salsa.debian.org.
