URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=17c0e248d75fc40efbca13164e897a009b2e3b23 Author: Emil Velikov <emil.veli...@collabora.com> Date: Mon Jan 29 11:27:18 2018 +0000
Update version to 18.0.0-rc3 Signed-off-by: Emil Velikov <emil.veli...@collabora.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=92a332ed1a0d4753f78a6c5d58615ef1e5512dc6 Author: Emil Velikov <emil.veli...@collabora.com> Date: Fri Jan 26 19:06:46 2018 +0000 cherry-ignore: add patches picked without -x Signed-off-by: Emil Velikov <emil.veli...@collabora.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=74b39c0bbf2467799b2b225c8059ce56413147cb Author: Maxin B. John <maxin.j...@intel.com> Date: Thu Jan 18 13:33:37 2018 +0200 anv_icd.py: improve reproducible builds Sort the output to ensure build reproducibility Signed-off-by: Maxin B. John <maxin.j...@intel.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> Fixes: 0ab04ba979b ("anv: Use python to generate ICD json files") Reviewed-by: Dylan Baker <dy...@pnwbakers.com> Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> (cherry picked from commit 8116b9170bc36bb15512f97a7680ad97bddd56a8) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a5bdf2abf9d87c34ab5ebec5a2bbf78b4e19db5b Author: Bas Nieuwenhuizen <ba...@chromium.org> Date: Thu Jan 25 16:48:17 2018 +0100 radeonsi: Export signalled sync file instead of -1. -1 is considered an error for EGL_ANDROID_native_fence_sync, so we need to actually create a sync file. Fixes: f536f45250 "radeonsi: implement sync_file import/export" Reviewed-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 5a3404d443e0c6e8e9a44d7f8dccf96c5ac18f0f) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=305b0b135612dfe80b95f20e22fb5a526f8fa886 Author: Dave Airlie <airl...@redhat.com> Date: Thu Jan 25 09:29:55 2018 +1000 radv: don't enable tc compat for d32s8 + 4/8 samples (v1.1) This seems to be broken, at least the cts tests fail. This fixes: dEQP-VK.renderpass.suballocation.multisample.d32_sfloat_s8_uint.samples_4 dEQP-VK.renderpass.suballocation.multisample.d32_sfloat_s8_uint.samples_8 2 samples seems to pass fine, amdvlk doesn't appear to enable TC for possibly some other reasons here. This is most likely a hack. v1.1: add a bit of explaination text. (Samuel) Fixes: ad3d98da9 (radv: enable tc compatible htile for d32s8 also.) Signed-off-by: Dave Airlie <airl...@redhat.com> Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> (cherry picked from commit f4c534ef68a479055190f8ec8d551be0f56ef361) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=28680e72b87aa29fa7542c5a55eceb6ccb356204 Author: Emil Velikov <emil.veli...@collabora.com> Date: Wed Dec 20 17:34:55 2017 +0000 configure.ac: correct driglx-direct help text The default was toggled a while back, but the text wasn't updated. Fixes: bd526ec9e1b ("configure: Always default to --enable-driglx-direct") Cc: Jon TURNEY <jon.tur...@dronecode.org.uk> Signed-off-by: Emil Velikov <emil.veli...@collabora.com> Reviewed-by: Daniel Stone <dani...@collabora.com> (cherry picked from commit 6aeef5464497a2dfd2eb63c7e4aa3349c7794eae) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=32b2c0da59ec97e0f524430209992d01498a29a6 Author: Roland Scheidegger <srol...@vmware.com> Date: Thu Jan 25 04:30:41 2018 +0100 gallivm: fix crash with seamless cube filtering with different min/mag filter We are not allowed to modify the incoming coords values, or things may crash (as we may be inside a llvm conditional and the values may be used in another branch). I recently broke this when fixing an issue with NaNs and seamless cube map filtering, and it causes crashes when doing cubemap filtering if the min and mag filters are different. Add const to the pointers passed in to prevent this mishap in the future. Fixes: a485ad0bcd ("gallivm: fix an issue with NaNs with seamless cube filtering") Reviewed-by: Jose Fonseca <jfons...@vmware.com> (cherry picked from commit 4fe662c58f6453b3558de479e7c2bfe4158dc26c) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b01ea9701e328896659a5ffad79f2762f177a087 Author: Greg V <greg@unrelenting.technology> Date: Wed Jan 24 21:02:43 2018 +0300 meson: handle LLVM 'x.x.xgit-revision' versions When LLVM is built inside of a git repo (even way below, e.g. /usr/ports/.git exists, and LLVM is built in /usr/ports/devel/llvm50/work), its version becomes something like 5.0.0git-f8ab206b2176. New meson versions already handle this, but we support older versions too. Fixes: 673dda8330769 ("meson: build "radv" vulkan driver for radeon hardware") Reviewed-by: Dylan Baker <dy...@pnwbakers.com> (cherry picked from commit 8fae5eddd9982f4586d76471d0196befeb46de24) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf22d563f5e8984c7efb90425cb50d168fc3b8d9 Author: Greg V <greg@unrelenting.technology> Date: Wed Jan 24 21:02:42 2018 +0300 meson: fix getting cflags from pkg-config get_pkgconfig_variable('cflags') always returns an empty list, it's a function for getting *custom* variables. Meson does not yet support asking for cflags, so explicitly invoke pkg-config for now. Fixes: 68076b87474e ("meson: build gallium vdpau state tracker") Fixes: a817af8a89eb ("meson: build gallium xvmc state tracker") Fixes: 1d36dc674d52 ("meson: build gallium omx state tracker") Fixes: 5a785d51a6d6 ("meson: build gallium va state tracker") Reviewed-by: Dylan Baker <dylan.c.ba...@intel.com> (cherry picked from commit 53f9131205a63fa8b282ab2a7e96c48209447da0) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=af8c66ba6bc199dc9cf780466ccecabe863ac1d0 Author: Greg V <greg@unrelenting.technology> Date: Wed Jan 24 21:02:39 2018 +0300 meson: fix missing dependencies Fixes: 66f97f6640f5 ("meson: build radeonsi") Reviewed-by: Emil Velikov <emil.veli...@colalbora.com> Reviewed-by: Dylan Baker <dylan.c.ba...@intel.com> (cherry picked from commit 7c8cfe2d59bfc0dbf718a74b08b6dceaa84f7242) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a807ad2f7c0e43b627d943e91cb6f65197ac0b94 Author: Dylan Baker <dy...@pnwbakers.com> Date: Tue Jan 23 10:28:08 2018 -0800 meson: correctly set SYSCONFDIR for loading dirrc Fixes: d1992255bb29 ("meson: Add build Intel "anv" vulkan driver") Reported-by: Marc Dietrich <marvi...@gmx.de> Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com> (cherry picked from commit 5781c3d1db4a01e77f416c1685025c4d830ae87d) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=90e4f150530abe02d3b1bf306c83e823c1560778 Author: Dave Airlie <airl...@redhat.com> Date: Wed Jan 24 12:53:26 2018 +1000 radv: move spi_baryc_cntl to pipeline We need to enable the pos float location 2 mode anytime we have persample not just when forced by the frag shader. This fixes: dEQP-VK.pipeline.multisample.min_sample_shading* Fixes: 58c97a079 (radv: enable location at sample when persample is forced.) Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 298554541da220ebdcd9aa9b9055ede2481d5817) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=12afb389d64ef20c81b45ff4277aa9ffc72092c1 Author: Scott D Phillips <scott.d.phill...@intel.com> Date: Wed Jan 24 11:24:12 2018 -0800 meson: Fix define for USE_SSE41 Before we were adding -DHAVE_SSE41 which isn't what the code is looking for, so some uses of the sse4.1 code were always being skipped. v2: Don't add any compile check for the quite old -msse4.1 option (Dylan) Fixes: 84486f6462 ("meson: Enable SSE4.1 optimizations") Reviewed-by: Dylan Baker <dy...@pnwbakers.com> (cherry picked from commit 0b8d38bd48b219bd979b2ee0ef1ce2b7184f7095) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2d7035ee48ce2f6f502243f1b8d51a5339172788 Author: Brian Paul <bri...@vmware.com> Date: Tue Jan 23 10:48:51 2018 -0700 vbo: fix incorrect min/max_index values in display list draw call This fixes another regression from commit 8e4efdc895ea ("vbo: optimize some display list drawing"). The problem was the min_index, max_index values passed to the vbo drawing function were not computed to compensate for the biased prim::start values. https://bugs.freedesktop.org/show_bug.cgi?id=104746 https://bugs.freedesktop.org/show_bug.cgi?id=104742 https://bugs.freedesktop.org/show_bug.cgi?id=104690 Tested-by: Clayton Craft <clayton.a.cr...@intel.com> Fixes: 8e4efdc895ea ("vbo: optimize some display list drawing") Reviewed-by: Emil Velikov <emil.veli...@collabora.co.uk> (cherry picked from commit 365a48abddcabf6596c2e34a784d91c8ab929918) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=80ca933e687de5801295cc00f50c887601a13b25 Author: Dave Airlie <airl...@redhat.com> Date: Tue Jan 23 11:07:26 2018 +1000 radv: fix sample_mask_in loading. (v3.1) This is ported from radeonsi and fixes: dEQP-VK.pipeline.multisample_shader_builtin.sample_mask.bit_* v2: don't call this path for radeonsi, it does it in the epilog. use the radeonsi code path. v3: handle NULL pCreateInfo->pMultisampleState properly (Samuel) v3.1: set ps_iter_samples default to 1 (Bas) Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> Fixes: bdcbe7c76 (radv: add sample mask input support) Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 766589d89a211e67f313e8cb38f2d05b09975f96) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=05e6e669bdf47d331f2481ff54a6c9b692047178 Author: Dave Airlie <airl...@redhat.com> Date: Tue Jan 23 16:07:50 2018 +1000 radv: don't use hw resolves for r16g16 norm formats. radeonsi has a workaround for this, but it uses a R16A16 format, which vulkan doesn't have, we could probably come up with a work around but for now just avoid hw resolves. Fixes: dEQP-VK.renderpass.suballocation.multisample.r16g16_*norm* Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> Fixes: 2a04f5481d (radv/meta: select resolve paths) Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit c727ea9370adc5362e00208b9f1481764b8ef215) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=62803e022eae6d3b173600c5849cf512c75e89e2 Author: Dave Airlie <airl...@redhat.com> Date: Tue Jan 23 14:57:12 2018 +1000 radv: don't use hw resolve for integer image formats From reading AMDVLK it currently never uses hw resolve paths. This patch takes from radeonsi which doesn't use hw resolve for integer formats, and does the same for radv. This fixes: dEQP-VK.renderpass.suballocation.multisample*uint tests. Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> Fixes: 2a04f5481d (radv/meta: select resolve paths) Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 4df414bbd2f1a44840c982198f4c8353f242ca15) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e76f0abed8a7f3a3539d9507e327cf3d2cc76ad4 Author: Dave Airlie <airl...@redhat.com> Date: Tue Jan 23 15:48:08 2018 +1000 radv: add fs_key meta format support to resolve passes. Some of the hw resolve passes need the SPI color format setup correctly. This fixes lots of 16-bit and 32-bit format tests in dEQP-VK.renderpass.suballocation.multisample* Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> Fixes: f4e499ec7914 "radv: add initial non-conformant radv vulkan driver" Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 316d762186f0bfc225b82794fdae520275a448db) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=eaf9500651dc9511a93933669b4e4ffb3a559d16 Author: Christoph Haag <haa...@frickel.club> Date: Sat Jan 20 18:53:13 2018 +0100 meson: remove lib prefix from libd3dadapter9.so Fixes: 6b4c7047d57178d336 ("meson: build gallium nine state_tracker") Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Dylan Baker <dylan.c.ba...@intel.com> (cherry picked from commit 4b4d929c27f1c395bb4ca6ef035dee7303ff5723) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3ca5ace19dd5a98159f534eededd65db11c3c9e3 Author: Eric Engestrom <eric.engest...@imgtec.com> Date: Tue Dec 19 13:41:35 2017 +0000 radeon: remove left over dead code Fixes: 4e0d99a63588c67a955f "r100: Use shared debug code" Cc: Pauli Nieminen <suok...@gmail.com> Signed-off-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Eric Anholt <e...@anholt.net> (cherry picked from commit eee8dd7c3360ec0daf3d44168b6d1c32c52bf69b) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e1ac54507e1b8df8fb214ef63bf39e13475b7927 Author: Rafael Antognolli <rafael.antogno...@intel.com> Date: Wed Jan 24 16:33:58 2018 -0800 i965/gen10: Re-enable push constants. The GPU hang caused by push constants is apparently fixed, so let's enable them again. Signed-off-by: Rafael Antognolli <rafael.antogno...@intel.com> Cc: "18.0" <mesa-sta...@lists.freedesktop.org> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> (cherry picked from commit bcfd78e4489f538e34138269650fc6cbe8c9d75f) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dcdeb6a33e0047606468d2eeaf2023a6d4420373 Author: Rafael Antognolli <rafael.antogno...@intel.com> Date: Wed Jan 24 16:33:57 2018 -0800 anv/gen10: Ignore push constant packets during context restore. Similar to the GL driver, ignore 3DSTATE_CONSTANT_* packets when doing a context restore. Signed-off-by: Rafael Antognolli <rafael.antogno...@intel.com> Cc: Jason Ekstrand <ja...@jlekstrand.net> Cc: "18.0" <mesa-sta...@lists.freedesktop.org> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> (cherry picked from commit 78c125af3904c539ea69bec2dd9fdf7a5162854f) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8452d0f46675a38e90c5d79f7eeb368830f5516c Author: Rafael Antognolli <rafael.antogno...@intel.com> Date: Wed Jan 24 16:33:56 2018 -0800 i965/gen10: Ignore push constant packets during context restore. These packets were causing GPU hangs when the context was restored, possibly because they were pointing to BO's that were already unreferenced. So we tell the hardware to ignore such packets after the batch buffer ends, since we know those BO's are not around anymore. This change fixes GPU hangs on CNL. The (partial) solution to this problem so far was to entirely disable push constants on this platform. Signed-off-by: Rafael Antognolli <rafael.antogno...@intel.com> Cc: Kenneth Graunke <kenn...@whitecape.org> Cc: "18.0" <mesa-sta...@lists.freedesktop.org> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> (cherry picked from commit ca19ee33d7d39cb89d948b1c983763065975ce5b) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=123a39cd6abaccf6e6fb80b1bdc0698a81da9734 Author: Eleni Maria Stea <es...@igalia.com> Date: Thu Jan 25 13:09:00 2018 -0700 mesa: Fix function pointers initialization in status tracker We assigned the function that gets the device uuid to the GetDriverUuid function pointer and the function that gets the driver uuid to the GetDeviceUuid function pointer inside the state tracker. Exchanged the pointers. cc: mesa-sta...@lists.freedesktop.org Reviewed-by: Brian Paul <bri...@vmware.com> (cherry picked from commit 8096b558a7d769b20b1545b83399d67b8a3df94a) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=639d95e93f85e87161ceb0b299ac8a476b9cd89d Author: Samuel Pitoiset <samuel.pitoi...@gmail.com> Date: Wed Jan 24 23:26:20 2018 +0100 ac/nir: set amdgpu.uniform and invariant.load for UBOs UBOs are constants buffers. Cc: "18.0" <mesa-sta...@lists.freedesktop.org> Fixes: 41c36c45 ("amd/common: use ac_build_buffer_load() for emitting UBO loads") Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Tested-by: Alex Smith <asm...@feralinteractive.com> Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> (cherry picked from commit 49b0a140a731069e0e4959c65bfd1b597a4fb141) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=70814af14f9a146aa9452dd771c1295d1bc8cfed Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Wed Jan 17 17:10:34 2018 -0800 anv/pipeline: Don't look at blend state unless we have an attachment Without this, we may end up dereferencing blend before we check for binding->index != UINT32_MAX. However, Vulkan allows the blend state to be NULL so long as you don't have any color attachments. This fixes a segfault when running The Talos Principal. Fixes: 12f4e00b69e724a23504b7bd3958fb75dc462950 Cc: mesa-sta...@lists.freedesktop.org Reviewed-by: Alex Smith <asm...@feralinteractive.com> Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> (cherry picked from commit c8949e24984266cca3593291c30ea199baef5358) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ca6942c672f5b4e3e9ae32b0c58e796ceea59c08 Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Thu Dec 14 22:10:10 2017 -0800 i965/fs: Reset the register file to VGRF in lower_integer_multiplication 18fde36ced4279f2577097a1a7d31b55f2f5f141 changed the way temporary registers were allocated in lower_integer_multiplication so that we allocate regs_written(inst) space and keep the stride of the original destination register. This was to ensure that any MUL which originally followed the CHV/BXT integer multiply regioning restrictions would continue to follow those restrictions even after lowering. This works fine except that I forgot to reset the register file to VGRF so, even though they were assigned a number from alloc.allocate(), they had the wrong register file. This caused some GLES 3.0 CTS tests to start failing on Sandy Bridge due to attempted reads from the MRF: ES3-CTS.functional.shaders.precision.int.highp_mul_fragment.snbm64 ES3-CTS.functional.shaders.precision.int.mediump_mul_fragment.snbm64 ES3-CTS.functional.shaders.precision.int.lowp_mul_fragment.snbm64 ES3-CTS.functional.shaders.precision.uint.highp_mul_fragment.snbm64 ES3-CTS.functional.shaders.precision.uint.mediump_mul_fragment.snbm64 ES3-CTS.functional.shaders.precision.uint.lowp_mul_fragment.snbm64 This commit remedies this problem by, instead of copying inst->dst and overwriting nr, just make a new register and set the region to match inst->dst. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103626 Fixes: 18fde36ced4279f2577097a1a7d31b55f2f5f141 Cc: "17.3" <mesa-sta...@lists.freedesktop.org> Reviewed-by: Matt Turner <matts...@gmail.com> (cherry picked from commit db682b8f0eafd3b9d58e736e9e2f520943a89942) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9550852086ef5a664df3516cc5c08b1aa2d6360e Author: Chuck Atkins <chuck.atk...@kitware.com> Date: Tue Jan 23 08:52:46 2018 -0500 configure.ac: add missing llvm dependencies to .pc files v2: Only add as dependencies for gallium-osmesa and gallium-xlib CC: <mesa-sta...@lists.freedesktop.org> Signed-of-by: Chuck Atkins <chuck.atk...@kitware.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit 6ac5e851f1a0b83d84156bc79983fd9527d4c296) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=25940451321604174e3616fda297d545b100f68e Author: George Kyriazis <george.kyria...@intel.com> Date: Tue Jan 23 16:12:42 2018 -0600 swr/rast: support llvm 3.9 type declarations LLVM 3.9 was not taken into account in initial check-in. Fixes: 01ab218bbc ("swr/rast: Initial work for debugging support.") cc: mesa-sta...@lists.freedesktop.org Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104749 Acked-by: Emil Velikov <emil.veli...@collabora.com> Reviewed-by: Bruce Cherniak <bruce.chern...@intel.com> (cherry picked from commit 0e879aad2fd1dac102c13d680edf455aa068d5df) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b62cefdef80cd258e838307e34393f7669a874a7 Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Tue Jan 23 23:47:26 2018 -0800 i965/draw: Set NEW_AUX_STATE when draw aux changes Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104411 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104383 Fixes: ea0d2e98ecb369ab84e78c84709c0930ea8c293a Cc: mesa-sta...@lists.freedesktop.org Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> (cherry picked from commit 20f70ae3858bc213e052a8434f0e637eb36203c4) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=521d5b4dcc858e4d02fedb741b00266397e2f443 Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Tue Jan 23 23:13:10 2018 -0800 i965: Replace draw_aux_buffer_disabled with draw_aux_usage Instead of keeping an array of booleans, we now hang onto an array of isl_aux_usage enums. This means that the thing we are passing from brw_draw.c to surface state setup is the thing that surface state setup actually needs instead of an input to compute what it needs. Cc: mesa-sta...@lists.freedesktop.org Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> (cherry picked from commit e52a9f18d69c94b7cb7f81361cdb9e2582c3d742) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=85c18bb410983b0f6a544d91ae7e3d3fe05591dc Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Wed Jan 24 11:43:55 2018 -0800 i965/surface_state: Drop brw_aux_surface_disabled The only purpose of this function is to disable aux on texture surfaces when the corresponding renderbuffer has aux disabled. However, the act of disabling aux on the renderbuffer will cause it to be resolved and intel_miptree_texture_aux_usage will already check the resolved status of a texture and return ISL_AUX_USAGE_NONE for it. Even if we used CCS for it, that wouldn't really be a problem because the CCS will be in the pass-through state and so it would effectively be ignored. Cc: mesa-sta...@lists.freedesktop.org Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> (cherry picked from commit 468ea3cc451f2c71e7d1be528090cb0334d500c2) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d2e9fe8351b14d8d19022ad9f47c242cb5353672 Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Mon Jan 22 23:40:48 2018 -0800 i965/miptree: Add an aux_disabled parameter to render_aux_usage Only one of the callers of intel_miptree_render_aux_usage actually took brw->draw_aux_buffer_disabled into account. This was causing us to ignore draw_aux_buffer_disabled for the intel_miptree_prepare_render. This isn't a problem because the draw_aux_buffer_disabled entry was set during texture preparation and we already did the resolve at that time. However, this also meant that the aux_usage we were passing to brw_cache_flush_for_render and brw_render_cache_add_bo was wrong so our automatic cache flushing around aux_usage changes wasn't happening. This was causing GPU hangs in Oxenfree. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104711 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104411 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104383 Fixes: ea0d2e98ecb369ab84e78c84709c0930ea8c293a Cc: mesa-sta...@lists.freedesktop.org Reviewed-by: Iago Toral Quiroga <ito...@igalia.com> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> (cherry picked from commit d38ec24f531fac0b53c406a09d17427309a3ffca) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a6f4d96a1a33a0933479c3e4cf18ce2bc2062fe3 Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Mon Jan 22 23:33:53 2018 -0800 i965/miptree: Take an aux_usage in prepare/finish_render Both callers of intel_miptree_prepare/finish_render have to call intel_miptree_render_aux_usage anyway for other reasons. They may as well pass the result in instead of us calling it again. Cc: mesa-sta...@lists.freedesktop.org Reviewed-by: Iago Toral Quiroga <ito...@igalia.com> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> (cherry picked from commit dfe02179055b2504303e23988ab3d446b40de05a) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=658e9e442c94d0c0d041aba520739b8a9fc2b9ba Author: Greg V <greg@unrelenting.technology> Date: Wed Jan 24 21:02:40 2018 +0300 meson: fix BSD build CC: 18.0 <mesa-sta...@lists.freedesktop.org> Reviewed-by: Dylan Baker <dy...@pnwbakers.com> Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com> (cherry picked from commit c38c60a63c63b02d1030c6c349aa0a73105e10eb) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=48510dccc4dffa09c5533b06f6e7ed578d075bde Author: Marek Olšák <marek.ol...@amd.com> Date: Wed Jan 10 13:37:08 2018 +0100 radeonsi: don't ignore pitch for imported textures Cc: 17.2 17.3 <mesa-sta...@lists.freedesktop.org> Tested-by: Dieter Nützel <die...@nuetzel-hh.de> Reviewed-by: Nicolai Hähnle <nicolai.haeh...@amd.com> (cherry picked from commit 022c5b22fee5d92da67f48601ea80b1c810a829d) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f6f43e6a4c13b0b8d8425dd9a62306a0d0f5a2f5 Author: Topi Pohjolainen <topi.pohjolai...@intel.com> Date: Tue Jan 16 14:17:00 2018 +0200 i965: Don't try to disable render aux buffers for compute Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104546 Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> Signed-off-by: Topi Pohjolainen <topi.pohjolai...@intel.com> (cherry picked from commit ec4bb693a0175744465f272a8bcea2db043ba1bc) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=90b00bf76677e0288b293755f05bcdb9b836646c Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Fri Dec 15 16:55:54 2017 -0800 anv/cmd_buffer: Move gen7 index buffer state to graphics state Tested-by: Józef Kucia <joseph.ku...@gmail.com> Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> Cc: "18.0" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit 4064fe59e7144fa822568543cfcc043387645d4e) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=19b3e2b7818465eb5a69ceb8c1915987f914b227 Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Fri Dec 15 16:53:03 2017 -0800 anv/cmd_buffer: Move num_workgroups to compute state While we're here, make it an anv_address. Tested-by: Józef Kucia <joseph.ku...@gmail.com> Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> Cc: "18.0" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit 38ec78049f69821091a2d42b0f457a1b044d4273) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=81a740b94180ddcbd5448ca0bd89ae55f34f12c2 Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Fri Dec 15 16:48:53 2017 -0800 anv/cmd_buffer: Move dynamic state to graphics state Tested-by: Józef Kucia <joseph.ku...@gmail.com> Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> Cc: "18.0" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit 95ff2322948692f5f7b1d444aabe878fba53304c) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f310f42ed36bd178a04445e26c49c447c67aa1fc Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Fri Dec 15 16:47:56 2017 -0800 anv/cmd_buffer: Use a temporary variable for dynamic state We were already doing this for some packets to keep the lines shorter. We may as well just do it for all of them. Tested-by: Józef Kucia <joseph.ku...@gmail.com> Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> Cc: "18.0" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit 24caee8975355a2b54b41c484ff3c897e1911760) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8c93db854ceea505f7cf31c3d8b666da0f12df17 Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Fri Dec 15 16:39:53 2017 -0800 anv/cmd_buffer: Move vb_dirty bits into anv_cmd_graphics_state Vertex buffers are entirely a graphics pipeline thing. Tested-by: Józef Kucia <joseph.ku...@gmail.com> Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> Cc: "18.0" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit 8bd5ec5b862333c936426ff18d093d07dd006182) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=76e7324b7939ac1e7b74b76e419e18150c68b9b8 Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Fri Dec 15 16:38:10 2017 -0800 anv/cmd_buffer: Move dirty bits into anv_cmd_*_state Tested-by: Józef Kucia <joseph.ku...@gmail.com> Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> Cc: "18.0" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit e85aaec1489b00f24ebef4ae5b1da598091275e1) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=66d17b545f0d0ebfd19b5e31a2a796de2c9a9cc8 Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Fri Dec 15 14:02:27 2017 -0800 anv: Separate compute and graphics descriptor sets The Vulkan spec says: "pipelineBindPoint is a VkPipelineBindPoint indicating whether the descriptors will be used by graphics pipelines or compute pipelines. There is a separate set of bind points for each of graphics and compute, so binding one does not disturb the other." Up until now, we've been ignoring the pipeline bind point and had just one bind point for everything. This commit separates things out into separate bind points. Tested-by: Józef Kucia <joseph.ku...@gmail.com> Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102897 Cc: "18.0" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit 97f96610c8b858267c121c0ad6ffc630e2aafc09) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=144a300204762dfaf583f6496693dd4f8c9fc266 Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Fri Dec 15 13:59:33 2017 -0800 anv/cmd_buffer: Use anv_descriptor_for_binding for samplers Tested-by: Józef Kucia <joseph.ku...@gmail.com> Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> Cc: "18.0" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit 31b2144c836485ef6476bd455f1c02b96deafab7) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2dec9ce6874525bef0c12165b072eafe5f272500 Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Fri Dec 15 13:47:53 2017 -0800 anv/cmd_buffer: Add a helper for binding descriptor sets This lets us unify some code between push descriptors and regular descriptors. It doesn't do much for us yet but it will. Tested-by: Józef Kucia <joseph.ku...@gmail.com> Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> Cc: "18.0" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit b9e1ca16f84016f1d40efa9bfee89db48a7702b4) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bde35c09dee9c2d95b2d8ad296fcba0f304f80fd Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Fri Dec 15 12:33:34 2017 -0800 anv/cmd_buffer: Refactor ensure_push_descriptor_set It's now a function which returns the push descriptor set. Since we set the error on the command buffer, returning the error is a little redundant. Returning the descriptor set (or NULL on error) is more convenient. Tested-by: Józef Kucia <joseph.ku...@gmail.com> Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> Cc: "18.0" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit 90cceaa9dd3b12e039a131a50c6866dce04e7fb2) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=064fbf718094dc04cb8c23c39e406402815d4990 Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Fri Dec 15 13:41:21 2017 -0800 anv: Remove semicolons from vk_error[f] definitions With the semicolons, they can't be used in a function argument without throwing syntax errors. Tested-by: Józef Kucia <joseph.ku...@gmail.com> Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> Cc: "18.0" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit d5592e2fdaa9ce8b98d38b2d29e2a7d2c4abda08) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb5abcd715fab4c1dff991062e5339004d255198 Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Fri Dec 15 11:39:31 2017 -0800 anv/cmd_buffer: Add substructs to anv_cmd_state for graphics and compute Initially, these just contain the pipeline in a base struct. Tested-by: Józef Kucia <joseph.ku...@gmail.com> Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> Cc: "18.0" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit 9af5379228d7be9c7ea41e0912a8770d28ead92b) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f0a1c2c69ee3c26fb949406e923d3ed571357b37 Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Fri Dec 15 09:32:29 2017 -0800 anv/cmd_buffer: Use some pre-existing pipeline temporaries There are several places where we'd already saved the pipeline off to a temporary variable but, due to an artifact of history, weren't actually using that temporary everywhere. No functional change. Tested-by: Józef Kucia <joseph.ku...@gmail.com> Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> Cc: "18.0" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit ddc2d285484a1607f79ffeb2fc6c09367c6aea1f) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3c85e8c8e35792d239690ebe12d034402af684b2 Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Fri Dec 15 09:23:08 2017 -0800 anv/cmd_buffer: Rework anv_cmd_state_reset This splits anv_cmd_state_reset into separate init and finish functions. This lets us share init code with cmd_buffer_create. This potentially fixes subtle bugs where we may have missed some bit of state that needs to get initialized on command buffer creation. Tested-by: Józef Kucia <joseph.ku...@gmail.com> Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> Cc: "18.0" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit cd3feea74582cea2d18306d167609f4fbe681bb3) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2ecc2f85feda3cbf3ca10a0df63b97b6422a5ab5 Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Fri Dec 15 09:12:11 2017 -0800 anv/cmd_buffer: Get rid of the meta query workaround Meta has been gone for a long time. Tested-by: Józef Kucia <joseph.ku...@gmail.com> Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> Cc: "18.0" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit d6c9a89d1324ed2c723cbd3c6d8390691c58dfd2) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f4f0838d31f85251e88dbb9f4c36873e33102f74 Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Fri Dec 15 08:52:21 2017 -0800 anv/cmd_state: Drop the scratch_size field This is a legacy left-over from the mechanism we used to use to handle scratch. The new (and better) mechanism doesn't use this. Tested-by: Józef Kucia <joseph.ku...@gmail.com> Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> Cc: "18.0" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit bc0a21e34811e0e1542236dbaf5fb1fa56bbb98c) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=44b15816bbeedd4abda848af9b95e9cbca464ef1 Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Fri Dec 15 11:27:39 2017 -0800 anv/pipeline: Don't assert on more than 32 samplers This prevents an assert when running one unreleased Vulkan game. Tested-by: Józef Kucia <joseph.ku...@gmail.com> Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> Cc: "18.0" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit 4b69ba381766cd911eb1284f1b0332a139ec8a75) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4d0b43117de8a02bb3dd19810227b8c415155f67 Author: Marc Dietrich <marvi...@gmx.de> Date: Tue Jan 23 15:49:43 2018 +0100 meson: fix some defines misspelled errors in meson.build Defines - HAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL - HAVE_FUNC_ATTRIBUTE_VISIBILITY were misspelled. Signed-off-by: Marc Dietrich <marvi...@gmx.de> Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com> (cherry picked from commit 911ca587f8785a90702f88d3c9044b7149e6d2b3) _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit