Timo Aaltonen pushed to branch upstream-experimental at X Strike Force / lib / mesa
Commits: 0ff13c29 by Samuel Iglesias Gonsálvez at 2019-09-18T16:38:42Z intel/nir: do not apply the fsin and fcos trig workarounds for consts If we have fsin or fcos trigonometric operations with constant values as inputs, we will multiply the result by 0.99997 in brw_nir_apply_trig_workarounds, making the result wrong. Adjusting the rules so they do not apply to const values we let a later constant fold to deal with it. v2: - Do not early constant fold but only apply the trig workaround for non constants (Caio). - Add fixes tag to commit log (Caio). Fixes: bfd17c76c12 "i965: Port INTEL_PRECISE_TRIG=1 to NIR." Signed-off-by: Samuel Iglesias Gonsálvez <sigles...@igalia.com> Signed-off-by: Andres Gomez <ago...@igalia.com> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.olive...@intel.com> (cherry picked from commit 3c474f851313db5318d727d017b763ea2cb01e6d) - - - - - fa59ef37 by Haihao Xiang at 2019-09-18T16:38:42Z i965: support AYUV/XYUV for external import only Fixes: 89785e2d56e7fa ("i965: add support for sampling from AYUV") Fixes: 7cab8d3661f243 ("i965: Add support for sampling from XYUV images") Cc: Vivek Kasireddy <vivek.kasire...@intel.com> Cc: Lionel Landwerlin <lionel.g.landwer...@intel.com> Signed-off-by: Haihao Xiang <haihao.xi...@intel.com> Reviewed-by: Tapani Pälli <tapani.pa...@intel.com> (cherry picked from commit 8a9b81ab9dbd44ea4ce87b8fb8ebc4ec3530a3f9) - - - - - 9bf80c2b by Bas Nieuwenhuizen at 2019-09-18T16:38:42Z tu: Set up glsl types. Addresses this assert: deqp-vk: ../mesa-freedreno-9999/src/compiler/glsl_types.cpp:1244: static const glsl_type *glsl_type::get_interface_instance(const glsl_struct_field *, unsigned int, enum glsl_interface_packing, bool, const char *): Assertion `glsl_type_users > 0' failed. running dEQP-VK.api.smoke.triangle . Fixes: 624789e3708 "compiler/glsl: handle case where we have multiple users for types" Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> (cherry picked from commit 7999e10cab93fe854fbc7accd4d8cf2e60726b75) - - - - - d0832208 by Samuel Pitoiset at 2019-09-18T16:38:42Z radv: fix loading 64-bit GS inputs We have to load 2 32-bit integer and to cast correctly. This fixes crashes with gs-double-interpolator.vk_shader_test. Cc: 19.2 <mesa-sta...@lists.freedesktop.org> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111734 Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> (cherry picked from commit 68820007fddbb5b79f1b2b08e66ef14092053a95) - - - - - 6ee069f9 by Dylan Baker at 2019-09-23T18:08:24Z cherry-ignore: Add patches - - - - - b1ea3dcc by Dylan Baker at 2019-09-23T18:11:50Z rehardcode from origin/master to upstream/master - - - - - e27644cc by Dylan Baker at 2019-09-23T18:11:55Z bin/get-pick-list: use --oneline=pretty instead of --oneline --oneline shortens hashes, while --oneline=pretty doesn't, otherwise they are the same. Having full hashes is convenient as that is the format that the bin/.cherry-ignore script requires to work correctly. - - - - - 401de438 by Samuel Pitoiset at 2019-09-23T18:11:59Z radv/gfx10: fix VK_KHR_pipeline_executable_properties with NGG GS No GS copy shader if a pipeline enables NGG GS. This fixes dEQP-VK.pipeline.executable_properties.graphics.*geometry_stage*. Fixes: 86864eedd2d ("radv: Implement radv_GetPipelineExecutablePropertiesKHR.") Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> (cherry picked from commit 99c186fbbe3e2da0f176eadb1db0a8a640786384) - - - - - 0c29a15a by Eric Engestrom at 2019-09-23T18:11:59Z gl: drop incorrect pkg-config file for glvnd Akin to 1a25980c469b38d2c645 ("egl: drop incorrect pkg-config file for glvnd") and b01524fff05eef66e8cd ("meson: don't build libGLES*.so with GLVND") , removes a pkg-config file that shouldn't have been there in the first place, but was needed because of that GLVND bug. Now that the glvnd bug has been fixed, it was apparent that this gl.pc pkg-config file was forgotten to be removed, so let's do just that :) Suggested-by: Matt Turner <matts...@gmail.com> Cc: mesa-sta...@lists.freedesktop.org Signed-off-by: Eric Engestrom <eric.engest...@intel.com> Reviewed-by: Matt Turner <matts...@gmail.com> (cherry picked from commit a1de3011f380b6ffd5583708b58e3f86d8d45ea9) - - - - - 770e77dc by Paulo Zanoni at 2019-09-23T18:11:59Z intel/fs: fix SHADER_OPCODE_CLUSTER_BROADCAST for SIMD32 The current code can create functions with a width of 32, which is not supported by our hardware. Add some code to simplify how we express what we want and prevent such cases. For some unknown reason, all the tests I could run seem to work even with these unsupported MOVs. Fixes: b0858c1cc6 "intel/fs: Add a couple of simple helper opcodes" Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> Signed-off-by: Paulo Zanoni <paulo.r.zan...@intel.com> (cherry picked from commit 8e614c7a29a8926b20f5c18ef447ff82cafb7f1c) - - - - - 00eaba77 by Tapani Pälli at 2019-09-23T18:11:59Z egl: check for NULL value like eglGetSyncAttribKHR does Commit d1e1563bb63 added a NULL check for eglGetSyncAttribKHR but eglGetSyncAttrib does not do this. Patch adds same check to happen with eglGetSyncAttrib. Fixes crashes in (when exposing EGL 1.5): dEQP-EGL.functional.fence_sync.invalid.get_invalid_value Signed-off-by: Tapani Pälli <tapani.pa...@intel.com> Reviewed-by: Eric Engestrom <eric.engest...@intel.com> Cc: mesa-sta...@lists.freedesktop.org (cherry picked from commit 99cbec0a5f463fef4d9c61f34482d9eb00293704) - - - - - 0b54e1d1 by Arcady Goldmints-Orlov at 2019-09-23T18:11:59Z anv: fix descriptor limits on gen8 Later generations support bindless for samplers, images, and buffers and thus per-stage descriptors are not limited by the binding table size. However, gen8 doesn't support bindless images and thus needs to report a lower per-stage limit so that all combinations of descriptors that fit within the advertised limits are reported as supported by vkGetDescriptorSetLayoutSupport. Fixes test dEQP-VK.api.maintenance3_check.descriptor_set Fixes: 79fb0d27f3 ("anv: Implement SSBOs bindings with GPU addresses in the descriptor BO") Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> (cherry picked from commit 5ec5fecc26d1818157298c8507ba208f9f3501a1) - - - - - 75836b70 by Andres Gomez at 2019-09-23T18:11:59Z docs: Add the maximum implemented Vulkan API version in 19.2 rel notes Currently, Vulkan 1.1. Cc: 19.2 <mesa-sta...@lists.freedesktop.org> Signed-off-by: Andres Gomez <ago...@igalia.com> Reviewed-by: Eric Engestrom <e...@engestrom.ch> Reviewed-by: Dylan Baker <dy...@pnwbakers.com> (cherry picked from commit 41b0e0d7e0f2353d337e68e8e439b5dfead880c4) - - - - - ac9ef75a by Adam Jackson at 2019-09-23T18:11:59Z docs: Update bug report URLs for the gitlab migration Cc: mesa-sta...@lists.freedesktop.org Reviewed-by: Eric Anholt <e...@anholt.net> Reviewed-by: Eric Engestrom <eric.engest...@intel.com> (cherry picked from commit 5b5c5bf8335b79c7c1152bbdf0956598d2246567) - - - - - 2d30c0fc by Ian Romanick at 2019-09-23T18:11:59Z nir/algebraic: Do not apply late DPH optimization in vertex processing stages Some shaders do not use 'invariant' in vertex and (possibly) geometry shader stages on some outputs that are intended to be invariant. For various reasons, this optimization may not be fully applied in all shaders used for different rendering passes of the same geometry. This can result in Z-fighting artifacts (at best). For now, disable this optimization in these stages. In tessellation stages applications seem to use 'precise' when necessary, so allow the optimization in those stages. Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111490 Fixes: 09705747d72 ("nir/algebraic: Reassociate fadd into fmul in DPH-like pattern") All Gen8+ platforms had similar results. (Ice Lake shown) total instructions in shared programs: 16194726 -> 16344745 (0.93%) instructions in affected programs: 2855172 -> 3005191 (5.25%) helped: 6 HURT: 20279 helped stats (abs) min: 1 max: 3 x̄: 1.33 x̃: 1 helped stats (rel) min: 0.44% max: 1.00% x̄: 0.54% x̃: 0.44% HURT stats (abs) min: 1 max: 32 x̄: 7.40 x̃: 7 HURT stats (rel) min: 0.14% max: 42.86% x̄: 8.58% x̃: 6.56% 95% mean confidence interval for instructions value: 7.34 7.45 95% mean confidence interval for instructions %-change: 8.48% 8.67% Instructions are HURT. total cycles in shared programs: 364471296 -> 365014683 (0.15%) cycles in affected programs: 32421530 -> 32964917 (1.68%) helped: 2925 HURT: 16144 helped stats (abs) min: 1 max: 403 x̄: 18.39 x̃: 5 helped stats (rel) min: <.01% max: 22.61% x̄: 1.97% x̃: 1.15% HURT stats (abs) min: 1 max: 18471 x̄: 36.99 x̃: 15 HURT stats (rel) min: 0.02% max: 52.58% x̄: 5.60% x̃: 3.87% 95% mean confidence interval for cycles value: 21.58 35.41 95% mean confidence interval for cycles %-change: 4.36% 4.52% Cycles are HURT. (cherry picked from commit 92f70df8c38a36d913334c596ce26af64b6c569b) - - - - - 6485fd83 by Hal Gentz at 2019-09-23T18:11:59Z gallium/osmesa: Fix the inability to set no context as current. Currently there is no way to make no context current w/gallium + osmesa. The non-gallium version of osmesa does this if the context and buffer passed to `OSMesaMakeCurrent` are both null. This small change makes it so that this is also the case with the gallium version. Cc: mesa-sta...@lists.freedesktop.org Signed-off-by: Hal Gentz <zegen...@protonmail.com> Reviewed-by: Eric Anholt <e...@anholt.net> (cherry picked from commit 57c894334ee14c7075bc8c1fb8ff180631ccb527) - - - - - dc712977 by Jason Ekstrand at 2019-09-23T18:11:59Z nir/repair_ssa: Replace the unreachable check with the phi builder In a3268599f3c9, I attempted to fix nir_repair_ssa for unreachable blocks. However, that commit missed the possibility that the use is in a block which, itself, is unreachable. In this case, we can end up in an infinite loop trying to replace a def with itself. Even though a no-op replacement is a fine operation, it keeps extending the end of the uses list as we're walking it. Instead of explicitly checking for the group of conditions, just check if the phi builder gives us a different def. That's guaranteed to be 100% reliable and, while it lacks symmetry with the is_valid checks, should be more reliable. Fixes: a3268599 "nir/repair_ssa: Repair dominance for unreachable..." Reviewed-by: Ian Romanick <ian.d.roman...@intel.com> (cherry picked from commit d63162cff0e0922fc3c2ef5dfd4402004caf141e) - - - - - 5e289248 by Marek Olšák at 2019-09-24T15:23:45Z amd: add more PCI IDs for Navi14 trivial and urgent Cc: 19.2 <mesa-sta...@lists.freedesktop.org> (cherry picked from commit 65b698136c5ef0ef1a15cb6fbff13cbc4ceb3881) - - - - - 9f94cd71 by Marek Olšák at 2019-09-24T15:23:50Z ac/addrlib: fix chip identification for Vega10, Arcturus, Raven2, Renoir Cc: 19.2 <mesa-sta...@lists.freedesktop.org> Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-pra...@amd.com> (cherry picked from commit 48742de601a8afea1e5f99637f5823a97ca21915) - - - - - a1b62127 by Kenneth Graunke at 2019-09-24T15:23:56Z intel: Increase Gen11 compute shader scratch IDs to 64. >From the MEDIA_VFE_STATE docs: "Starting with this configuration, the Maximum Number of Threads must be set to (#EU * 8) for GPGPU dispatches. Although there are only 7 threads per EU in the configuration, the FFTID is calculated as if there are 8 threads per EU, which in turn requires a larger amount of Scratch Space to be allocated by the driver." It's pretty clear that we need to increase this for scratch address calculations, because the FFTID has a certain bit-pattern. The quote above seems to indicate that we should increase the actual thread count programmed in MEDIA_VFE_STATE as well, but we think the intention is to only bump the scratch space. Fixes GPU hangs in Bioshock Infinite and Synmark's CSDof on Icelake 8x8. Fixes: 5ac804bd9ac ("intel: Add a preliminary device for Ice Lake") Reviewed-by: Matt Turner <matts...@gmail.com> (cherry picked from commit b9e93db20896a436c716107dd0d12057b3aa9f72) - - - - - c90dc123 by Juan A. Suarez Romero at 2019-09-24T15:24:17Z bin/get-pick-list.sh: sha1 commits can be smaller than 8 chars The script only handles commits with "Fixes: <sha1>" where <sha1> is equal or great than 8 chars. But <sha1> can be smaller, like 7 chars. This commit relax the restriction to handle <sha1> 4 or more chars. Fixes: 533fead4236 ("bin/get-pick-list.sh: tweak the commit sha matching pattern") Acked-by: Eric Engestrom <eric.engest...@intel.com> Signed-off-by: Juan A. Suarez Romero <jasua...@igalia.com> (cherry picked from commit b3c25e6f9953b6c7d196b47c6ba1987f681edf7d) - - - - - 5037ffb6 by Bas Nieuwenhuizen at 2019-09-24T15:24:22Z radv: Add workaround for hang in The Surge 2. Released today and hangs on RADV. We don't have the root cause yet, but this should unblock people playing the game. No drirc because the radv debugflags are not usable from drirc and I want this backported. CC: <mesa-sta...@lists.freedesktop.org> Reviewed-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 780182f0a0caa9b6f48f87b1930b3bcba1ac9319) - - - - - f7e25ae6 by Erik Faye-Lund at 2019-09-24T15:25:01Z util: fix SSE-version needed for double opcodes This code generates CVTSD2SI, which requires SSE2. So let's fix the required SSE-version. Signed-off-by: Erik Faye-Lund <erik.faye-l...@collabora.com> Fixes: 5de29ae (util: try to use SSE instructions with MSVC and 32-bit gcc) Reviewed-by: Matt Turner <matts...@gmail.com> (cherry picked from commit 2ade1c5cf790ab8df62e4ff9d67e360ac870ff1f) - - - - - ba8b282a by Mauro Rossi at 2019-09-24T15:25:27Z android: mesa: revert "Enable asm unconditionally" This patch partially reverts 20294dc ("mesa: Enable asm unconditionally, ...") Android makefile build logic needs to disable assembler optimization in 32bit builds to avoid text relocations for libglapi.so shared Fixes the following build error with Android x86 32bit target: [ 0% 4/477] target SharedLib: libglapi (out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so) FAILED: out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so ... prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld: warning: shared library text segment is not shareable prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld: error: treating warnings as errors clang-6.0: error: linker command failed with exit code 1 (use -v to see invocation) Fixes: 20294dc ("mesa: Enable asm unconditionally, now that gen_matypes is gone.") Signed-off-by: Mauro Rossi <issor.or...@gmail.com> Acked-by: Eric Engestrom <e...@engestrom.ch> (cherry picked from commit 7a6e7803a791724841346b4b274ce68bcf3fff3f) - - - - - 0d781fe4 by Mauro Rossi at 2019-09-24T15:25:33Z android: anv: libmesa_vulkan_common: add libmesa_util static dependency Change needed to fix the following building error: In file included from external/mesa/src/intel/vulkan/anv_device.c:43: external/mesa/src/util/xmlpool.h:115:10: fatal error: 'xmlpool/options.h' file not found ^~~~~~~~~~~~~~~~~~~ 1 error generated. Fixes: 4dcb1ff ("anv: add support for driconf") Signed-off-by: Mauro Rossi <issor.or...@gmail.com> Reviewed-by: Eric Engestrom <e...@engestrom.ch> (cherry picked from commit ae5ac26dfa13de84c09f897c828cf621729ce622) - - - - - e59e9cd5 by Eric Engestrom at 2019-09-25T16:30:31Z meson: re-add incorrect pkg-config files with GLVND for backward compatibility This is a bit counter-intuitive, but the issue is that GLVND is broken in versions <= 1.1.1, so we need to keep wrongly providing these files to cover up their mistake, otherwise the rest of the world ends up broken. Suggested-by: Dylan Baker <dy...@pnwbakers.com> Cc: mesa-sta...@lists.freedesktop.org Signed-off-by: Eric Engestrom <eric.engest...@intel.com> Reviewed-by: Dylan Baker <dy...@pnwbakers.com> (cherry picked from commit 93df862b6affb6b8507e40601212a58012bfa873) - - - - - 8ea440fa by Dylan Baker at 2019-09-25T16:55:33Z docs: Add release notes for 19.2.0 - - - - - 0c47b502 by Dylan Baker at 2019-09-25T16:56:31Z Bump version for 19.2.0 final - - - - - 30 changed files: - Android.common.mk - Android.mk - SConstruct - VERSION - bin/.cherry-ignore - bin/get-pick-list.sh - docs/bugs.html - docs/helpwanted.html - docs/releasing.html - docs/relnotes/19.2.0.html - include/pci_ids/radeonsi_pci_ids.h - meson.build - src/amd/addrlib/src/amdgpu_asic_addr.h - src/amd/vulkan/radv_device.c - src/amd/vulkan/radv_nir_to_llvm.c - src/amd/vulkan/radv_pipeline.c - src/compiler/nir/nir_opt_algebraic.py - src/compiler/nir/nir_repair_ssa.c - src/egl/main/eglapi.c - src/egl/meson.build - src/freedreno/vulkan/tu_device.c - src/gallium/drivers/i915/TODO - src/gallium/drivers/iris/iris_program.c - src/gallium/state_trackers/osmesa/osmesa.c - src/intel/Android.vulkan.mk - src/intel/compiler/brw_fs_generator.cpp - src/intel/compiler/brw_nir_trig_workarounds.py - src/intel/vulkan/anv_allocator.c - src/intel/vulkan/anv_descriptor_set.c - src/intel/vulkan/anv_device.c The diff was not included because it is too large. View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/compare/71fafc13b9491f4ccc75fa821008fb863ffdb033...0c47b502c23c28f7dd993fd069b9193653dfb586 -- View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/compare/71fafc13b9491f4ccc75fa821008fb863ffdb033...0c47b502c23c28f7dd993fd069b9193653dfb586 You're receiving this email because of your account on salsa.debian.org.