URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=15f1b50cee1ae0cfe5ba571272d41c371e8814f0 Author: Emil Velikov <emil.veli...@collabora.com> Date: Wed Mar 21 14:17:29 2018 +0000
Update version to 18.0.0-rc5 Signed-off-by: Emil Velikov <emil.veli...@collabora.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=05ae1d463faef1ab5dd5e7078d874eb8f4a5ed23 Author: Marek Olšák <marek.ol...@amd.com> Date: Thu Feb 22 20:21:42 2018 +0100 radeonsi: prevent a negative buffer offset in si_upload_descriptors (cherry picked from commit 16856a1ee86f364212674dddf154caa374310a6b) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3d4383f1399f9bd3cdaea794b0fa9be87f3d80f8 Author: Marek Olšák <marek.ol...@amd.com> Date: Wed Feb 21 23:33:38 2018 +0100 radeonsi: fix vertex buffer address computation with full 64-bit addresses (cherry picked from commit 2a47660754ba49d5998929550f639677506c4515) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3fec971d712c604adb0bd33def50d97b56da0b66 Author: Andres Gomez <ago...@igalia.com> Date: Mon Mar 5 17:25:36 2018 +0200 travis: keep meson version below 0.45.0 Recently Meson upgraded to 0.45.0 and it needs python 3.5+, which is not available in Trusty. Cc: Eric Engestrom <eric.engest...@imgtec.com> Cc: Dylan Baker <dy...@pnwbakers.com> Cc: Emil Velikov <emil.veli...@collabora.com> Cc: Jon Turney <jon.tur...@dronecode.org.uk> Signed-off-by: Andres Gomez <ago...@igalia.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Dylan Baker <dy...@pnwbakers.com> (cherry picked from commit 72552012c7b461b887c44b3f90e2744bc7512a74) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9f86aee1d16d3c1eb296a8549587d98285991553 Author: Andres Gomez <ago...@igalia.com> Date: Wed Feb 28 23:18:59 2018 +0200 travis: make Meson find the proper llvm-config Travis CI has moved to LLVM 5.0, and meson is detecting automatically the available version in /usr/local/bin based on the PATH env variable order preference. As for 0.44.x, Meson cannot receive the path to the llvm-config binary as a configuration parameter. See https://github.com/mesonbuild/meson/issues/2887 and https://github.com/dcbaker/meson/commit/7c8b6ee3fa42f43c9ac7dcacc61a77eca3f1bcef We want to use the custom (APT) installed version. Therefore, let's make Meson find our wanted version sooner than the one at /usr/local/bin Once this is corrected, we would still need a patch similar to: https://lists.freedesktop.org/archives/mesa-dev/2017-December/180217.html v2: Create the link only to the specificly wanted LLVM version (Gert). Cc: Eric Engestrom <eric.engest...@imgtec.com> Cc: Dylan Baker <dy...@pnwbakers.com> Cc: Emil Velikov <emil.veli...@collabora.com> Cc: Juan A. Suarez Romero <jasua...@igalia.com> Cc: Gert Wollny <gw.foss...@gmail.com> Cc: Jon Turney <jon.tur...@dronecode.org.uk> Signed-off-by: Andres Gomez <ago...@igalia.com> Reviewed-and-Tested-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Dylan Baker <dy...@pnwbakers.com> Reviewed-by: Juan A. Suarez <jasua...@igalia.com> Reviewed-By: Gert Wollny <gw.foss...@gmail.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit b5b912dfeebabafbaff176fe4205eb74607f709b) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=282591dd00775c39eb21754cec8dd95fc7960319 Author: Vadym Shovkoplias <vadim.shovkopl...@gmail.com> Date: Tue Feb 13 11:38:22 2018 -0700 mesa: add glsl version query (v4) Add support for GL_NUM_SHADING_LANGUAGE_VERSIONS and glGetStringi for GL_SHADING_LANGUAGE_VERSION v2: - Combine similar functionality into _mesa_get_shading_language_version() function. - Change GLSL version return mechanism. v3: - Add return of empty string for GLSL ver 1.10. - Move _mesa_get_shading_language_version() function to src/mesa/main/version.c. v4: - Add OpenGL version check. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104915 Signed-off-by: Andriy Khulap <andriy.khu...@globallogic.com> Signed-off-by: Vadym Shovkoplias <vadym.shovkopl...@globallogic.com> Reviewed-by: Brian Paul <bri...@vmware.com> (cherry picked from commit a553c54abf92533daf442073dd3408c35f57d8ba) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4f49caf17a8983e652f290f468c78acfae2e6625 Author: Eric Anholt <e...@anholt.net> Date: Sat Feb 10 11:22:53 2018 +0000 i965: Silence compiler warning about promoted_constants. We only have a cfg != NULL if we went through one of the paths that set it, but my compiler doesn't figure that out. Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Fixes: 6411defdcd6f ("intel/cs: Re-run final NIR optimizations for each SIMD size") (cherry picked from commit d25640c3a3b914059abd661f0651d88b4fe408e8) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=876880b7524092d19cfcc353302d0db89f4d219d Author: Dave Airlie <airl...@redhat.com> Date: Wed Mar 14 10:21:46 2018 +1000 radv: mark all tess output for an indirect access. If a shader does a tcs store with an indirect access, we were only marking the first spot as used. For indirect access we always now mark all slots used by the variable. Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105464 Fixes: 94f9591995 (radv/ac: add support for TCS/TES inputs/outputs.) Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 27a5e5366e89498d98d786cc84fafbdb220c4d94) Emil Velikov: move hunks {radv,ac}_nir_to_llvm.c] Signed-off-by: Emil Velikov <emil.veli...@collabora.com> Conflicts: src/amd/vulkan/radv_nir_to_llvm.c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=14f55a8221b4b714737ee95c80c39bf33837a039 Author: Dave Airlie <airl...@redhat.com> Date: Wed Mar 14 10:19:45 2018 +1000 ac/nir: pass the nir variable through tcs loading. I was going to have to add another parameter to this monster, so we should just pass the nir_variable in, I can't find any reason this would be a bad idea. This needed for the next fix. Fixes: 94f9591995 (radv/ac: add support for TCS/TES inputs/outputs.) Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 4f0c89d66c570e82d832e2e49227517302e271a2) [Emil Velikov: move hunk {radv,ac}_nir_to_llvm.c] Signed-off-by: Emil Velikov <emil.veli...@collabora.com> Conflicts: src/amd/common/ac_nir_to_llvm.c src/amd/common/ac_shader_abi.h src/amd/vulkan/radv_nir_to_llvm.c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=82a426af5fcbfe907fde96f99a7a58bc43a54e0e Author: Dave Airlie <airl...@redhat.com> Date: Wed Mar 14 05:41:53 2018 +1000 radv: get correct offset into LDS for indexed vars. This seems more correct to me, since if we have an array of floats they'll be vec4 aligned, and if we do af[2], we want the const index to increase by 2 slots in the non compact case. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105464 Fixes: 94f9591995 (radv/ac: add support for TCS/TES inputs/outputs.) Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit f9de2d409bf4f068a99d358d592d96ab4803f7fb) [Emil Velikov: hunk belongs to another file {radv,ac}_nir_to_llvm.c] Signed-off-by: Emil Velikov <emil.veli...@collabora.com> Conflicts: src/amd/vulkan/radv_nir_to_llvm.c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a3602cdfe712706e4c273d9402e78d028ee2391e Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Fri Mar 9 21:23:23 2018 -0800 i965: Emit texture cache invalidates around blorp_copy This is a terrible hack but it fixes CTS regressions. It's still incredibly unclear exactly what is going wrong in the hardware to cause this to be an issue so this isn't a good fix by any means. However, it does fix tests so there is that. Fixes: fb0e9b5197 "i965: Track the depth and render caches separately" Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103746 Acked-by: Kenneth Graunke <kenn...@whitecape.org> (cherry picked from commit 8379bff6c4456f8a77041eee225dcd44e5e00a76) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=16eb9feca7044a6763c9fd26b0c5409112a08e12 Author: Dylan Baker <dy...@pnwbakers.com> Date: Fri Mar 9 08:27:31 2018 -0800 meson: Add moduledir to d3d.pc This is required to build wine with the nine patchset Fixes: 6b4c7047d57178d3362a710ad503057c6a582ca3 ("meson: build gallium nine state_tracker") Reported-by: Mike Lothian <m...@fireburn.co.uk> Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com> (cherry picked from commit b7c6870f87acafd592629d1c3127b54e52689f02) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=582cae39bd59dd54ad089d95ca35f4e48dcb5186 Author: Ian Romanick <ian.d.roman...@intel.com> Date: Wed Mar 7 21:05:34 2018 -0800 mesa: Don't write to user buffer in glGetTexParameterIuiv on error With some sets of optimization flags, GCC will generate warnings like this: src/mesa/main/texparam.c:2327:27: warning: ‘*((void *)&ip+12)’ may be used uninitialized in this function [-Wmaybe-uninitialized] params[3] = ip[3]; ~~^~~ src/mesa/main/texparam.c:2320:16: note: ‘*((void *)&ip+12)’ was declared here GLint ip[4]; ^~ ip is not initialized in cases where a GL error is generated. In these cases, we should *not* write to the user's buffer, so this is actually a bug. I wrote a new piglit test gl-3.0-texparameteri to show this bug. I suspect that Coverity also detected this, but the scan site is currently down. Fixes: c2c507786 "main: Added entry points for glGetTextureParameteriv, Iiv, and Iuiv." Signed-off-by: Ian Romanick <ian.d.roman...@intel.com> Reviewed-by: Matt Turner <matts...@gmail.com> (cherry picked from commit def0030e64dd3a4eb3487dd40bf64b9a71a70af3) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=676af78077d58fef0a7afbb472e22cf3a66729ca Author: Marek Olšák <marek.ol...@amd.com> Date: Wed Mar 7 13:47:28 2018 -0500 st/dri: fix OpenGL-OpenCL interop for GL_TEXTURE_BUFFER Tested by our OpenCL team. Fixes: 9c499e6759b26c5e "st/mesa: don't invoke st_finalize_texture & st_convert_sampler for TBOs" Acked-by: Alex Deucher <alexander.deuc...@amd.com> (cherry picked from commit db495b8962909f74e90b9eb0463fb37f37ac5f62) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd36f7f2f720fc72df4ccd7015d6d0087e013b08 Author: Dylan Baker <dy...@pnwbakers.com> Date: Fri Mar 2 09:57:54 2018 -0800 autotools: include all meson.build files Otherwise SWR cannot be built with meson from an autotools generated tarball, such as the 18.0.0-rc4 tarball. Fixes: 16bf81383080 ("meson/swr: re-shuffle generated files") Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Reviewed-by: George Kyriazis <george.kyria...@intel.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit 7258be91c59b20a6479b3b0d750ff8b4a32cf032) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d007df9e9b5d76d328996d5c1665eea779f2ed98 Author: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> Date: Sun Mar 4 14:47:20 2018 +0100 radv: Fix copying from 3D images starting at non-zero depth. Fixes: f4e499ec79 "radv: add initial non-conformant radv vulkan driver" Reviewed-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit eea20d59abd304953c8c1591612d45d3d94eb785) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e2f8a6503d88b161d0ce898eaa92d284afb1a5bf Author: Vinson Lee <v...@freedesktop.org> Date: Sat Feb 24 15:49:32 2018 -0800 swr/rast: Fix macOS macro. Fixes: a25093de7188 ("swr/rast: Implement JIT shader caching to disk") Signed-off-by: Vinson Lee <v...@freedesktop.org> Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-By: George Kyriazis <george.kyria...@intel.com> (cherry picked from commit bb742b6ebf2d8c8dcc77f69b44995be2971e116a) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9f8e6c1efaecfa5126f154f67179f5d55f9cf6aa Author: Dylan Baker <dy...@pnwbakers.com> Date: Fri Mar 2 10:28:11 2018 -0800 meson: install vulkan_intel.h header Fixes: d1992255bb29054fa51763376d125183a9f602f3 ("meson: Add build Intel "anv" vulkan driver") Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit e23192022a2cde122a6ccc70e5495fda009bee12) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0a62b02c05a185a3e4f589bfb7577fb39cf64580 Author: Andriy Khulap <andriy.khu...@gmail.com> Date: Thu Mar 1 10:44:28 2018 +0200 i965: Fix RELOC_WRITE typo in brw_store_data_imm64() Fixes: 6c530ad11605 ("i965: Reduce passing 2x32b of reloc_domains to 2 bits") Signed-off-by: Andriy Khulap <andriy.khu...@globallogic.com> Signed-off-by: Vadym Shovkoplias <vadym.shovkopl...@globallogic.com> Reviewed-by: Chris Wilson <ch...@chris-wilson.co.uk> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> (cherry picked from commit 7859701920adc7f25696a05ae4715a4694109e1d) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7064c887937159cc3338e535cc46db535bdc051c Author: Iago Toral Quiroga <ito...@igalia.com> Date: Thu Mar 1 07:59:42 2018 +0100 i965/sbe: fix number of inputs for active components In 16631ca30ea6 we fixed gen9 active components to account for padded inputs in the URB, which we can have with SSO programs. To do that, instead of going through the bitfield of inputs (which doesn't include padding information), we compute the number of inputs from the size of the URB entry. Unfortunately, there are some special inputs that are not stored in the URB and that we also need to account for. These special inputs are identified and handled during calculate_attr_overrides(). Instead of keeping track of the exact number of inputs, we just program active components for all possible inputs like we do in anvil. This fixes a regression in a WebGL program that uses Point Sprite functionality (specifically, VARYING_SLOT_PNTC). v2: - Add 'Fixes' tag (Mark Janes) - make no_vue_inputs int instead of uint32_t, and add const qualifier to num_inputs variable (Ian) v3: - Do not try to count inputs correctly, just program all input slots like we do in anvil (Ken) Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105224 Fixes: 16631ca30ea6 (i965/sbe: fix active components for SSO programs with over 16 inputs) Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> (cherry picked from commit bc73016703f8f2815e000f1c100532cf6e13cd3c) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2f0d53d417863ae062d7de0f260b3f5563bd447c Author: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> Date: Mon Feb 26 22:54:06 2018 +0100 radv: Implement waiting on non-submitted fences. Fixes: f4e499ec79 "radv: add initial non-conformant radv vulkan driver" Reviewed-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 6968d782d3063c639e80dbcf6df944902d72692f) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8f9d123b76a106fd858d0c27a736d266e89af4a7 Author: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> Date: Mon Feb 26 22:50:41 2018 +0100 radv: Implement WaitForFences with !waitAll. Nothing to do except using a busy wait loop. At least for old kernels. A better implementation for newer kernels to come later. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105255 Fixes: f4e499ec79 "radv: add initial non-conformant radv vulkan driver" Reviewed-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 2a404c6f923880cfd0bc04f9db1890cadce8bd92) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=369d279f867a7ebc2ee8ce84bf53cad4d5c071eb Author: Dave Airlie <airl...@redhat.com> Date: Thu Mar 1 09:24:01 2018 +1000 ac/nir: don't apply slice rounding on txf_ms This matches the tgsi code. Fixes arb_texture_multisample texelFetch piglit tests. Reviewed-by: Timothy Arceri <tarc...@itsqueeze.com> 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 69495b30a38fbb01a937cdea6f7674f89a2e60e7) [Emil Velikov: trivial conflicts] Signed-off-by: Emil Velikov <emil.veli...@collabora.com> Conflicts: src/amd/common/ac_nir_to_llvm.c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2f5c2135d5041d6a111f43ee892c3f3528757d33 Author: Simon Hausmann <simon.hausm...@qt.io> Date: Wed Feb 14 12:51:11 2018 +0100 glsl: Fix memory leak with known glsl_type instances When looking up known glsl_type instances in the various hash tables, we end up leaking the key instances used for the lookup, as the glsl_type constructor allocates memory on the global mem_ctx. This patch changes glsl_type to manage its own memory, which fixes the leak and also allows getting rid of the global mem_ctx and its mutex. v2: remove lambda usage (Tapani) (+keep ASSERT_BITFIELD_SIZE, modify dummy ctor to initialize mem_ctx) Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104884 Cc: mesa-sta...@lists.freedesktop.org Signed-off-by: Simon Hausmann <simon.hausm...@qt.io> Signed-off-by: Tapani Pälli <tapani.pa...@intel.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> (cherry picked from commit fb5825e7ceeb16ac05f870ffe1e5a5daa09e68dd) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e8f95b5cfcf6b915e646450538c3d217a0dbd038 Author: Anuj Phogat <anuj.pho...@gmail.com> Date: Tue Feb 6 17:09:09 2018 -0800 intel/compiler: Memory fence commit must always be enabled for gen10+ Commit bit in the message descriptor (Bit 13) must be always set to true in CNL+ for memory fence messages. It also fixes a piglit GPU hang on cnl+ in simulation environment. Piglit test: arb_shader_image_load_store-shader-mem-barrier See HSD ES # 1404612949 Signed-off-by: Anuj Phogat <anuj.pho...@gmail.com> Cc: mesa-sta...@lists.freedesktop.org Reviewed-by: Francisco Jerez <curroje...@riseup.net> (cherry picked from commit 56dc9f9f49638e0769d6bc696ff7f5dafccec9fc) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cdf1f442427d4670688ad6207f360e282b84eda7 Author: Samuel Pitoiset <samuel.pitoi...@gmail.com> Date: Thu Mar 1 10:53:49 2018 +0100 radv: do not set pending_reset_query in BeginCommandBuffer() This is just useless for two reasons: 1) flush_bits is not set accordingly, so nothing will be flushed in BeginQuery(). 2) we always flush caches in EndCommandBuffer(), so if a reset is done in a previous command buffer we are safe. Cc: "18.0" <mesa-sta...@lists.freedesktop.org> Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Reviewed-by: Alex Smith <asm...@feralinteractive.com> Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> (cherry picked from commit c133a3411bbf47c2ba7d9cdae7e35a64fe276068) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6083211d8a81c13f2af55d92d1c30a45b25d34c0 Author: Dave Airlie <airl...@redhat.com> Date: Thu Mar 1 03:38:32 2018 +0000 r600/cayman: fix fragcood loading recip generation. This fixes some hangs seen where the recip_ieee opcodes would end up split across the wrong slots. Cc: <mesa-sta...@lists.freedesktop.org> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit bf2af063c3ac1ef7b948ddfb203aea04f857fc0f) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6ce732c500789682cf6271162398e7ec857f90f6 Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Wed Feb 28 19:57:44 2018 -0800 intel/fs: Set up sampler message headers in the visitor on gen7+ This gives the scheduler visibility into the headers which should improve scheduling. More importantly, however, it lets the scheduler know that the header gets written. As-is, the scheduler thinks that a texture instruction only reads it's payload and is unaware that it may write to the first register so it may reorder it with respect to a read from that register. This is causing issues in a couple of Dota 2 vertex shaders. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104923 Cc: mesa-sta...@lists.freedesktop.org Reviewed-by: Francisco Jerez <curroje...@riseup.net> (cherry picked from commit ff4726077d86800d33520581f154a27dac408588) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=795a3e10be3a63349a8c265252a3df6131851a7f Author: Dylan Baker <dy...@pnwbakers.com> Date: Wed Mar 14 09:16:28 2018 -0700 meson: radeonsi cannot be built with drm 2.4.90 Cc: 18.0 17.3 17.2 <mesa-sta...@lists.freedesktop.org> Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> [Emil Velikov: use correct version in commit message] Signed-off-by: Emil Vilikov <emil.veli...@collabora.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f2480c9f163743e7d1219405308e113bd7e48f50 Author: Samuel Pitoiset <samuel.pitoi...@gmail.com> Date: Wed Mar 14 09:46:33 2018 +0100 Revert "mesa: do not trigger _NEW_TEXTURE_STATE in glActiveTexture()" This reverts commit f314a532fdc7af8381586144d2631d9968331f05. This appears to introduce some blinking textures in UT2004. Not sure exactly what's the root cause because we don't have much information about the issue. Anyway, this was just a micro optimization that actually breaks, at least, one app almost one year later. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105436 Cc: <mesa-sta...@lists.freedesktop.org> Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Reviewed-by: Timothy Arceri <tarc...@itsqueeze.com> (cherry picked from commit f02f1ad13fa4123986d17a5d04b0e2831c3a7091) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d1c4153427b6158ad19547e23a7b6c44211466d0 Author: Marek Olšák <marek.ol...@amd.com> Date: Tue Mar 13 20:22:11 2018 -0400 configure.ac: blacklist libdrm 2.4.90 Cc: 18.0 17.3 17.2 <mesa-sta...@lists.freedesktop.org> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit 5d0acff39e4274ab803c17855115b231efcbef80) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=faffba77d64bf1c23806a14ae08b9b55903e9f54 Author: Alex Smith <asm...@feralinteractive.com> Date: Mon Mar 12 14:30:05 2018 +0000 radv: Fix CmdCopyImage between uncompressed and compressed images From the spec: "When copying between compressed and uncompressed formats the extent members represent the texel dimensions of the source image and not the destination." However, as per 7b890a36, we must still use the destination image type when clamping the extent so that we copy the correct number of layers for 2D to 3D copies. Fixes: 7b890a36 "radv: Fix vkCmdCopyImage for 2d slices into 3d Images" Cc: <mesa-sta...@lists.freedesktop.org> Signed-off-by: Alex Smith <asm...@feralinteractive.com> Reviewed-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit fcf267ba087dd00c48ceaf9277424dac079f9319) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1dc10f130999263c40d65349ce98ae3aa32b5138 Author: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> Date: Fri Mar 9 17:18:03 2018 +0100 radv: Increase the number of dynamic uniform buffers. The vulkan API is not ideal as it does not allow us have a shared limit. Feral needs 15+6 for one of their games, and I'm not a fan of overcommitting the limits, so increase the number of dynamic uniform buffers to 16. CC: <mesa-sta...@lists.freedesktop.org> CC: Alex Smith <asm...@feralinteractive.com> Reviewed-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 997306c031327b7e034e617736c868d6d21919eb) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2faad178ed090084f1ac676a08dcaee099bc3bd8 Author: Dave Airlie <airl...@redhat.com> Date: Fri Mar 9 16:03:53 2018 +1000 r600: implement callstack workaround for evergreen. This is ported from the sb backend, there are some issues with evergreen stacks on the boundary between entries and ALU_PUSH_BEFORE instructions. Whenever we are going to use a push before, we check the stack usage and if we have to use the workaround, then we switch to a separate push. I noticed this problem dealing with some of the soft fp64 shaders, in nosb mode, they are quite stack happy. This fixes all the glitches and inconsistencies I've seen with them Reviewed-by: Roland Scheidegger <srol...@vmware.com> Tested-by: Elie Tournier <elie.tourn...@collabora.com> Cc: <mesa-sta...@lists.freedesktop.org> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 5d4fbc2b54cb2aaea1cbb52ec087f31009f3ac76) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=611a88d4a6c89e3ab4793bea4bb78da4de76d200 Author: Jordan Justen <jordan.l.jus...@intel.com> Date: Tue Mar 6 23:28:00 2018 -0800 intel/vulkan: Hard code CS scratch_ids_per_subslice for Cherryview Ken suggested that we might be underallocating scratch space on HD 400. Allocating scratch space as though there was actually 8 EUs seems to help with a GPU hang seen on synmark CSDof. Cc: <mesa-sta...@lists.freedesktop.org> Signed-off-by: Jordan Justen <jordan.l.jus...@intel.com> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> (cherry picked from commit 24b415270ffeef873ba4772d1b3c7c185c9b1958) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=412ea8789e6fba6f979bb8db386b462cdd505e10 Author: Jordan Justen <jordan.l.jus...@intel.com> Date: Tue Mar 6 08:35:50 2018 -0800 i965: Hard code CS scratch_ids_per_subslice for Cherryview Ken suggested that we might be underallocating scratch space on HD 400. Allocating scratch space as though there was actually 8 EUs seems to help with a GPU hang seen on synmark CSDof. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104636 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105290 Cc: <mesa-sta...@lists.freedesktop.org> Signed-off-by: Jordan Justen <jordan.l.jus...@intel.com> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> Tested-by: Eero Tamminen <eero.t.tammi...@intel.com> (cherry picked from commit 06e3bd02c01e499332a9c02b40f506df9695bced) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=31506bbad5a8b311a6fec0c22af5fed3ed875054 Author: Marek Olšák <marek.ol...@amd.com> Date: Fri Mar 9 16:25:42 2018 -0500 radeonsi: add a workaround for GFX9 hang with init_config alignment Fixes: 75c5d25f0f34cd702 "radeonsi: align command buffer starting address to fix some Raven hangs" Cc: 17.3 18.0 <mesa-sta...@lists.freedesktop.org> (cherry picked from commit 2bdb54bce77828ef20b730ad869b66c5889b5347) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ba47865d7ddde24d9666b7481d99189c5d57240b Author: Marek Olšák <marek.ol...@amd.com> Date: Tue Mar 6 19:07:58 2018 -0500 radeonsi: align command buffer starting address to fix some Raven hangs Cc: 17.3 18.0 <mesa-sta...@lists.freedesktop.org> Reviewed-by: Christian König <christian.koe...@amd.com> Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> (cherry picked from commit 75c5d25f0f34cd70246ee1b0b77a75ec82dfcecb) [Emil Velikov: remove uvd_enc hunk - missing in branch] Signed-off-by: Emil Velikov <emil.veli...@collabora.com> Conflicts: src/amd/common/ac_gpu_info.c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3894eab901fbf0c19854abb0a531ce490b72b2da Author: Marek Olšák <marek.ol...@amd.com> Date: Fri Feb 23 20:42:41 2018 +0100 st/mesa: expose 0 shader binary formats for compat profiles for Qt Bugzilla: https://bugreports.qt.io/browse/QTBUG-66420 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105065 Cc: "18.0" <mesa-sta...@lists.freedesktop.org> Tested-by: Kai Wasserbäch <k...@dev.carbon-project.org> (cherry picked from commit 55376cb31e2f495a4d872b4ffce2135c3365b873) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ea43ba4e930d6fd822d171d021ec354a64664857 Author: Samuel Pitoiset <samuel.pitoi...@gmail.com> Date: Wed Feb 28 21:47:11 2018 +0100 radv: make sure to emit cache flushes before starting a query If the query pool has been previously resetted using the compute shader path. Fixes: a41e2e9cf5 ("radv: allow to use a compute shader for resetting the query pool") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105292 Cc: "18.0" <mesa-sta...@lists.freedesktop.org> Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> (cherry picked from commit c956d0f4069cf39d8d3c57ebed8d905575e9ea34) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3a9454f9d4a8d01edbfb16307e6cbcc85dd0ebaf Author: George Kyriazis <george.kyria...@intel.com> Date: Wed Feb 28 13:16:16 2018 -0600 swr/rast: Fix index buffer overfetch issue for non-indexed draws Populate pLastIndex, even for the non-indexed case. An zero pLastIndex can cause the index offsets inside the fetcher to have non-sensical values that can be either very large positive or very large negative numbers. cc: "18.0" <mesa-sta...@lists.freedesktop.org> Reviewed-by: Bruce Cherniak <bruce.chern...@intel.com> (cherry picked from commit 539de78633c45598e0b1e3b7763ea318f9200c32) [George Kyriazis: patch is a backport for 18.0 of the cherry-pick above] URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=682a859dbe535daa9b11b7836ab33536523a51f6 Author: Samuel Iglesias Gonsálvez <sigles...@igalia.com> Date: Mon Jan 29 13:46:28 2018 +0100 glsl/linker: fix bug when checking precision qualifier According to GLSL ES 3.2 spec, see table in 9.2.1 "Linked Shaders" section, the precision qualifier should match for uniform variables. This also applies to previous GLSL ES 3.x specs. This 'if' checks the condition for uniform variables, while for UBOs it is checked in link_interface_blocks.cpp. Fixes: b50b82b8a553 ("glsl/es31: precision qualifier doesn't need to match in shader interface block members") Signed-off-by: Samuel Iglesias Gonsálvez <sigles...@igalia.com> Reviewed-by: Tapani Pälli <tapani.pa...@intel.com> (cherry picked from commit e207b2e2c8dea99972e744c8fdfa0b9a9481ea5e) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3016b790762880a2f3777d9b449096c8db3e27c4 Author: Dave Airlie <airl...@redhat.com> Date: Wed Feb 28 04:37:45 2018 +0000 r600: partly revert disabling tiling for 1d texture. Previously we had a check for 1d of narrow 2D textures, however narrow 2d textures caused gpu hangs, but it was correct for 1d textures. This fixes a bunch of 1D image piglits for me. Fixes: 7b8e1c089d (r600/texture: drop lowering 1d/2d images to linear.) Reviewed-by: Roland Scheidegger <srol...@vmware.com> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit a5853a33332d51382cae42397f353817e47cccc9) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f5599cc17aa369c32213648bcbe6cc2526a31257 Author: Timothy Arceri <tarc...@itsqueeze.com> Date: Wed Feb 28 14:33:55 2018 +1100 nir: fix interger divide by zero crash during constant folding From the GLSL 4.60 spec Section 5.9 (Expressions): "Dividing by zero does not cause an exception but does result in an unspecified value." Fixes: 89285e4d47a6 "nir: add new constant folding infrastructure" Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105271 (cherry picked from commit 0c1f37cc2d8555223ade73b244a3ee374be8d9cd) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=36ac4550cfb985b010ba06f903df2bde3fc7d3c1 Author: Dylan Baker <dy...@pnwbakers.com> Date: Mon Feb 26 08:43:54 2018 -0800 meson: fix building without GL libgl will be undefined _glx, so move that check inside the `if with_glx != 'disabled'` block. v2: - Simplify commit message (Eric, Emil) Fixes: 5c460337fd9c109 ("meson: Fix GL and EGL pkg-config files with glvnd") Reported-by: Jason Ekstrand <jason.ekstr...@intel.com> Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> CC: Daniel Stone <dani...@collabora.com> Acked-by: Jason Ekstrand <ja...@jlekstrand.net> Untested-by: Jason Ekstrand <ja...@jlekstrand.net> Acked-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit b9636fe38aea6af1d3a30528da89069fc390b6a0) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=10d6f10a2e739964ffedb85c246b7b11269641ab Author: Dave Airlie <airl...@redhat.com> Date: Mon Feb 26 11:05:45 2018 +1000 r600: fix tgsi clock last setting On cayman this was hitting an assert later, which probably wasn't see on non-cayman due to having the t slot. Fixes: 9041730d1 (r600: add support for ARB_shader_clock.) (cherry picked from commit 0cc5be7741aa77bd65046d627370c18839e0da25) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=32add84fced002dad7cdccb9fc042574f1ea31aa Author: Dylan Baker <dy...@pnwbakers.com> Date: Tue Feb 20 10:36:44 2018 -0800 meson: Fix GL and EGL pkg-config files with glvnd Currently meson will generate a pkg-config that links to EGL_mesa (or GLX_mesa), but this isn't correct, it should always link to EGL or GL. Probably the "right" solution is to have glvnd itself provide the pkg config files for GL and EGL, but that also means that glvnd needs to provide many of the header files, which makes it a more involved job. Fixes: a47c525f3281a27 ("meson: build glx") Fixes: 035ec7a2bb2d5e4 ("meson: Add support for EGL glvnd") Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Reviewed-by: Daniel Stone <dani...@collabora.com> (cherry picked from commit 5c460337fd9c1096dea4bc569bd876a112ed6f16) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e3b13ef0a957c575fab61d1f929d87342cf1dd35 Author: Frank Binns <francisbi...@gmail.com> Date: Thu Feb 22 13:37:54 2018 +0000 egl/dri2: fix segfault when display initialisation fails dri2_display_destroy() is called when platform specific display initialisation fails. However, this would typically lead to a segfault due to the dri2_egl_display vbtl not having been set up. Fixes: 2db95482964 ("loader_dri3/glx/egl: Optionally use a blit context for blitting operations") Signed-off-by: Frank Binns <francisbi...@gmail.com> Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit 6160bf97db8bc493512795b1fa49c072a703df50) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c03f382fff4a485189bf80f8f3847dfdb36c9b98 Author: Samuel Pitoiset <samuel.pitoi...@gmail.com> Date: Fri Feb 23 14:21:06 2018 +0100 ac/nir: use ordered float comparisons except for not equal Original patch from Timothy Arceri, I have just fixed the not equal case locally. This fixes one important rendering issue in Wolfenstein 2 (the cutscene transition issue). RadeonSI uses the same ordered comparisons, so I guess that what we should do as well. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104302 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104905 Cc: <mesa-sta...@lists.freedesktop.org> Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Reviewed-by: Marek Olšák <marek.ol...@amd.com> Reviewed-by: Connor Abbott <cwabbo...@gmail.com> (cherry picked from commit e05507a427b79e481eb8e45d7aa3c9b4b78376bf) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=987ed51ec184c2509ba0ac270e827281e93cda56 Author: Mauro Rossi <issor.or...@gmail.com> Date: Sun Feb 4 22:57:11 2018 +0100 android: vulkan/util: add dependency on libnativewindow for O and later Similar to 90dd6e5 ("Android: egl: add dependency on libnativewindow") Fixes the following building error: In file included from out/target/product/x86_64/obj_x86/STATIC_LIBRARIES/libmesa_vulkan_util_intermediates/util/vk_enum_to_str.c:26: external/mesa/include/vulkan/vk_android_native_buffer.h:22:10: fatal error: 'system/window.h' file not found ^~~~~~~~~~~~~~~~~ 1 error generated. Cc: "18.0" <mesa-sta...@lists.freedesktop.org> Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit 6451b0703ff3027b746d6268b98dd2b3e6698be5) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c6859103ba1fb5bcc9f00dd6d7291942a396c2ee Author: Mauro Rossi <issor.or...@gmail.com> Date: Mon Feb 26 14:42:47 2018 +0200 android: anv: add dependency on libnativewindow for O and later Similar to 90dd6e5 ("Android: egl: add dependency on libnativewindow") Fixes the following building errors: In file included from external/mesa/src/intel/vulkan/gen7_cmd_buffer.c:30: In file included from external/mesa/src/intel/vulkan/anv_private.h:72: external/mesa/include/vulkan/vk_android_native_buffer.h:22:10: fatal error: 'system/window.h' file not found ^~~~~~~~~~~~~~~~~ 1 error generated. ... In file included from external/mesa/src/intel/vulkan/anv_gem.c:32: In file included from external/mesa/src/intel/vulkan/anv_private.h:72: external/mesa/include/vulkan/vk_android_native_buffer.h:22:10: fatal error: 'system/window.h' file not found ^~~~~~~~~~~~~~~~~ 1 error generated. Cc: "18.0" <mesa-sta...@lists.freedesktop.org> Reviewed-by: Tapani Pälli <tapani.pa...@intel.com> Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit d448954228e69fd1b4000ea13e28c2ba2832db13) [Emil Velikov: drop gen11 hunk] Signed-off-by: Emil Velikov <emil.veli...@collabora.com> Conflicts: src/intel/Android.vulkan.mk URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=18349ccf30b7d007573e88d76398d5c7195f3282 Author: Mauro Rossi <issor.or...@gmail.com> Date: Sun Feb 4 22:57:09 2018 +0100 android: anv/extensions: fix generated sources build Building rules are aligned to automake ones The correct script to build anv_extensions.{c,h} is anv_extensions_gen.py Generation rules for anv_extensions.c requires --out-c option Generation rules for anv_extensions.h were missing Necessary include paths are added to avoid following build errors: cp: cannot stat '.../gen/STATIC_LIBRARIES/libmesa_vulkan_common_intermediates/vulkan/anv_extensions.c': No such file or directory In file included from external/mesa/src/intel/vulkan/anv_gem.c:32: external/mesa/src/intel/vulkan/anv_private.h:75:10: fatal error: 'anv_extensions.h' file not found ^~~~~~~~~~~~~~~~~~ 1 error generated. In file included from external/mesa/src/intel/vulkan/anv_batch_chain.c:30: external/mesa/src/intel/vulkan/anv_private.h:75:10: fatal error: 'anv_extensions.h' file not found ^~~~~~~~~~~~~~~~~~ 1 error generated. Fixes: dd088d4bec7 ("anv/extensions: Generate a header file with extension tables") Cc: "18.0" <mesa-sta...@lists.freedesktop.org> Reviewed-by: Tapani Pälli <tapani.pa...@intel.com> (cherry picked from commit 9a508b719be32ef10ca929250b7aafba313104c6) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=45f4a85f99001265b6e091d5848596cadfe857c7 Author: Gert Wollny <gw.foss...@gmail.com> Date: Sat Feb 24 11:31:22 2018 +0100 r600: Take ALU_EXTENDED into account when evaluating jump offsets ALU_EXTENDED needs 4 DWORDS instead of the usual 2, hence if the last ALU clause within a IF-JUMP or ELSE branch is ALU_EXTENDED the target jump offset needs to be adjusted accordingly. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104654 Cc: <mesa-sta...@lists.freedesktop.org> Signed-off-by: Gert Wollny <gw.foss...@gmail.com> Reviewed-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit c7cadcbda47537d474eea52b9e77e57ef9287f9b) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=30a63012b4c027a47966740943632bb369fb0a0e Author: Francisco Jerez <curroje...@riseup.net> Date: Tue Feb 13 14:16:03 2018 -0800 i965: Fix KHR_blend_equation_advanced with some render targets. This reverts two bogus and seemingly useless changes from the commits referenced below, which broke KHR_blend_equation_advanced (and EXT_shader_framebuffer_fetch_non_coherent which wasn't exposed yet) for any kind of render target surface that would cause the get_isl_surf() call in brw_emit_surface_state() to do anything useful (notice how the result of get_isl_surf() is completely ignored by the caller right now), as was the case while using those extensions with 1D array or 3D framebuffers in particular. Fixes: f5859b45b1686e8116380d87 "i965/miptree: Switch remaining surfaces to isl" Fixes: bf24c3539e4b6989512968ca "i965/miptree: Clean-up unused" Cc: mesa-sta...@lists.freedesktop.org Reviewed-by: Plamena Manolova <plamena.manol...@intel.com> (cherry picked from commit 27c829da28ab3cfac0195d02ffb13afa8fe0e23d) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=046145ae81c546e1410d9077700aebbbceb7b029 Author: James Legg <jl...@feralinteractive.com> Date: Thu Feb 22 16:57:53 2018 +0000 radv: Really use correct HTILE expanded words. When transitioning to an htile compressed depth format, Set the full depth range, so later rasterization can pass HiZ. Previously, for depth only formats, the depth range was set to 0 to 0. This caused unwanted HiZ rejections with a VK_FORMAT_D16_UNORM depth buffer (VK_FORMAT_D32_SFLOAT was not affected somehow). These values are derived from PAL [0], since I can't find the specification describing the htile values. [0] https://github.com/GPUOpen-Drivers/pal/blob/5cba4ecbda9452773f59692f5915301e7db4a183/src/core/hw/gfxip/gfx9/gfx9MaskRam.cpp#L1500 CC: Dave Airlie <airl...@redhat.com> CC: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> CC: mesa-sta...@lists.freedesktop.org Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> Tested-by: Grazvydas Ignotas <nota...@gmail.com> Fixes: 5158603182fe7435 "radv: Use correct HTILE expanded words." (cherry picked from commit afd8fd0656a8eb3a2ce892381387aad3c6b0a78f) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bb51eb535566914124015c7a332ac5de42418f11 Author: Lionel Landwerlin <lionel.g.landwer...@intel.com> Date: Wed Feb 7 10:48:32 2018 +0000 i965: perf: ensure reading config IDs from sysfs isn't interrupted Fixes: 458468c136e "i965: Expose OA counters via INTEL_performance_query" Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Cc: <mesa-sta...@lists.freedesktop.org> Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com> (cherry picked from commit bd9672695b6b95085bb0af1d8eec9b550cdb01e6) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e6b583b7d8de15c60e5aef7c877ca5a89a705aa9 Author: George Kyriazis <george.kyria...@intel.com> Date: Tue Feb 13 10:41:48 2018 -0600 swr/rast: blend_epi32() should return Integer, not Float fix gcc8 compiler error for KNL. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105029 Reviewed-by: Bruce Cherniak <bruce.chern...@intel.com> (cherry picked from commit f1fbeb1a530f46402b201756b3e76a9b4ef0739b) Fixes: fc4f6c44c47 ("swr/rast: Switch intrinsic usage to SIMDLib") URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9b9e67f5b7681198a7519f5c71826c93ebc0180c Author: Karol Herbst <kher...@redhat.com> Date: Tue Feb 20 00:45:14 2018 +0100 nvir/nvc0: fix legalizing of ld unlock c0[0x10000] We have to increase the file index also for 0x10000 not just for values greater than 0x10000. Fixes: 37b67db6ae34fb6586d640a7a1b6232f091dd812 Signed-off-by: Karol Herbst <kher...@redhat.com> Reviewed-by: Ilia Mirkin <imir...@alum.mit.edu> (cherry picked from commit 7319311a504c06890181044668c8d01cf5ddd322) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=387b90a5a5e1b7435c573f2b1fe1d5eafc93a0b8 Author: Eric Anholt <e...@anholt.net> Date: Sat Feb 10 11:03:38 2018 +0000 glsl/tests: Fix a compiler warning about signed/unsigned loop comparison. Fixes: d32956935edf ("glsl: Walk a list of ir_dereference_array to mark array elements as accessed") Reviewed-by: Ian Romanick <ian.d.roman...@intel.com> (cherry picked from commit 4636ce362d4defc70a2b40cab1f52d1c890f5673) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d8bd4667025e53e44747522a2a925c33b3d9d3e6 Author: Eric Anholt <e...@anholt.net> Date: Sat Feb 10 10:41:07 2018 +0000 glsl: Silence warnings in the uniform initializer test about 16-bit types They should probably get unit tests implemented, but this cleans up a bunch of warnings in my build for now. Fixes: 59f458cd8703 ("glsl: Add 16-bit types") Cc: Eduardo Lima Mitev <el...@igalia.com> Reviewed-by: Ian Romanick <ian.d.roman...@intel.com> (cherry picked from commit 1b313eedb5e5da3c7ee3f62a83b66a6e097fe0d3) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ba5d7b18d0a2ea3c2017071ec916bdf3f1d98980 Author: Daniel Stone <dani...@collabora.com> Date: Thu Feb 15 15:04:51 2018 +0000 i965: Fix aux-surface size check The previous commit reworked the checks intel_from_planar() to check the right individual cases for regular/planar/aux buffers, and do size checks in all cases. Unfortunately, the aux size check was broken, and required the aux surface to be allocated with the correct aux stride, but full image height (!). As the ISL aux surface is not recorded in the DRIimage, we cannot easily access it to check. Instead, store the aux size from when we do have the ISL surface to hand, and check against that later when we go to access the aux surface. Signed-off-by: Daniel Stone <dani...@collabora.com> Fixes: c2c4e5bae3ba ("i965: Fix bugs in intel_from_planar") Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> (cherry picked from commit 9d21dbeb88bc99ca0e153c11265e19536ad36b61) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ca222a64b0eaadadeae247ddca9e437ca45e6297 Author: Dylan Baker <dy...@pnwbakers.com> Date: Fri Feb 16 09:07:25 2018 -0800 meson: freedreno depends on nir This fixes a race condition in building targets that link in freedreno. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105120 Fixes: 0bbecc5a8548883f76a7 ("meson: define driver dependencies") Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Acked-by: Mark Janes <mark.a.ja...@intel.com> (cherry picked from commit 03ab40b1f7bbff7f1c6ba128e202bdf31352ea66) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=654a881a5148404bfe88594c7b59769fab54d079 Author: Daniel Stone <dani...@collabora.com> Date: Thu Feb 15 09:17:52 2018 +0000 egl/wayland: Always use in-tree wayland-egl-backend.h A recent patchset to Wayland[0] migrated Mesa's libwayland-egl backend into Wayland itself, so implementations could provide backends. Mesa still uses its own, and the two have already diverged[1]. The include from egl_dri2.h could pick up either the installed Wayland wayland-egl-backend.h (with a 'driver_private' member), or the Mesa internal wayland-egl-backend.h (with a 'private' member), failing the build in the first instance. Add an explicit directory prefix to the include, so we always get our in-tree version. [0]: https://patchwork.freedesktop.org/series/31663/ [1]: https://cgit.freedesktop.org/wayland/wayland/commit/?id=9fa60983b579 Signed-off-by: Daniel Stone <dani...@collabora.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105103 Fixes: 198af27c679c ("wayland-egl: rename wayland-egl-{priv,backend}.h") (cherry picked from commit ff5432dc506111788ef19d25466b8c4ac91478d3) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=972c9a08cc0893aef474578a3ba844e8955dc465 Author: Dave Airlie <airl...@redhat.com> Date: Wed Feb 14 12:52:27 2018 +1000 virgl: remap query types to hw support. The gallium query types changed, so we need to remap from the gallium ones to the virgl ones. Fixes: dEQP-GLES3.functional.transform_feedback.basic_types* "This also fixes: dEQP-GLES3.functional.transform_feedback.array.separate* dEQP-GLES3.functional.transform_feedback.array_element* dEQP-GLES3.functional.transform_feedback.interpolation.* Gallium's p_defines.h and virglrenderer's p_defines.h have diverged quite a bit, so not including PIPE_QUERY_OCCLUSION_PREDICATE_CONSERVATIVE there makes sense for now." - Gurchetan Singh Fixes: 3f6b3d9db (gallium: add PIPE_QUERY_OCCLUSION_PREDICATE_CONSERVATIVE) Reviewed-by: Gurchetan Singh <gurchetansi...@chromium.org> Tested-by: Gurchetan Singh <gurchetansi...@chromium.org> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 60c14a0db25d3dd246744858179a52548325c25f) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5402319d570d51287df03480a303e3be7eec80c0 Author: Dylan Baker <dy...@pnwbakers.com> Date: Wed Jan 17 10:20:54 2018 -0800 meson: fix xvmc target linkage This needs to link the state tracker with --whole-archive to expose the right symbols. v4: - Always add libswdri and libswkmsdri to the link_with list Fixes: 22a817af8a89eb3c7 ("meson: build gallium xvmc state tracker") Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Acked-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit 2ab1ce30c4543fb4091795cbf6a5526e74c9e4aa) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a81d907a6cd8676054586f68a864acc7c2a1f075 Author: Dylan Baker <dy...@pnwbakers.com> Date: Wed Jan 17 10:12:19 2018 -0800 meson: Fix xa target linkage This needs to use --whole-archive (link_whole in meson) to properly expose symbols. v4: - Always add libswdri and libswkmsdri to link_with list Fixes: 0ba909f0f111824 ("meson: build gallium xa state tracker") Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Acked-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit 0b73c329bc024d94d85d4e0bf5e95cd8be635eb2) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7bc6404bbc4684a9d890986eed22dacb1272f1c9 Author: Dylan Baker <dy...@pnwbakers.com> Date: Wed Jan 17 10:12:19 2018 -0800 meson: Fix omx-bellagio target linkage This needs to use --whole-archive (link_whole in meson) to properly expose symbols. v4: - Always add libswdri and libswkmsdri to link_with Fixes: 1d36dc674d528b93b ("meson: build gallium omx state tracker") Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Acked-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit 91a59b628745a1f77b446c85ab6163a50ebe2e55) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=66f2e7801b7d90173da583f0bd7cf88cbb4f8285 Author: Dylan Baker <dy...@pnwbakers.com> Date: Wed Jan 17 09:49:55 2018 -0800 meson: fix va target linkage The state tracker needs to be linked with whole-archive (like autotools). As a result there are symbols from libswdri and libswkmsdri that are needed, so link those as well. v4: - Always add libswdri and libswkmsdri to link_with list Fixes: 5a785d51a6d6 ("meson: build gallium va state tracker") Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Acked-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit 2e4be28fb2a256c423485cc99b1250b2d3c92da6) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9d1499af33c00a33036a11b772afd4b8642d0659 Author: Dylan Baker <dy...@pnwbakers.com> Date: Thu Jan 11 09:22:24 2018 -0800 meson: fix vdpau target linkage The VDPAU state tracker needs to be linked with whole-archive (autotools does this). Because we are linking the whole archive we alos need to link with libswdri and libswkmsdri if those have been enabled. v4: - Always add libswdri and libswkmsdri to link_with list Fixes: 68076b87474e7959 ("meson: build gallium vdpau state tracker") Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Acked-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit 90d361753ce5a5e705adecbc68edaf7a6d0f51ee) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8069a71465ece86edeec9076a76d1542875284a0 Author: Dylan Baker <dy...@pnwbakers.com> Date: Thu Feb 1 16:09:02 2018 -0800 meson: Actually link xvmc target with libxvmc Unlike vdpau this is required. Fixes: 22a817af8a89eb3c7 ("meson: build gallium xvmc state tracker") Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Acked-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit 340305576840c2a432202f1ace9279f490d87e59) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0a12090b4ecd6ba4d7f3fdf5b78d4a7462f5fbfd Author: Dylan Baker <dy...@pnwbakers.com> Date: Thu Feb 1 16:03:17 2018 -0800 meson: actually link with libomxil-bellagio This state tracker actually needs to link, unlike vdpau. Fixes: 1d36dc674d528b93b ("meson: build gallium omx state tracker") Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Acked-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit 77081038579ed7ef3d0962637cddd6fae4d6d4fa) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c620eff8e2004048308cfa31ccec220bd41283de Author: Dylan Baker <dy...@pnwbakers.com> Date: Wed Jan 17 10:26:58 2018 -0800 meson: link dri3 xcb libs into vlwinsys instead of into each target This makes the dependencies easier to manage, since each media target doesn't need to worry about linking to half a dozen libraries. Fixes: b1b65397d0c4978e3 ("meson: Build gallium auxiliary") Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Acked-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit 7023b373ec76a2ea25b1bd0a7501276de9007047) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fc1f9c41b8e3d03accfef32b942761c13e8ac2bd Author: Dylan Baker <dy...@pnwbakers.com> Date: Thu Jan 18 10:03:24 2018 -0800 meson: use va-api version reported by pkg-config Fixes: 5a785d51a6d6 ("meson: build gallium va state tracker") Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Acked-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit 424e654cb02182c00d1b76c512a8fe17af281e4b) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b33937ab13bbe5cb5bca7e20604499d0fd5bda36 Author: Eric Engestrom <eric.engest...@imgtec.com> Date: Thu Dec 7 16:03:40 2017 +0000 meson: dedup gallium-xa logic Signed-off-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Dylan Baker <dy...@pnwbakers.com> (cherry picked from commit 2f0db33527fc5415858e60d76d5b82c5492151fa) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a731133c91fcb29233c9883760340eba10c98c71 Author: Eric Engestrom <eric.engest...@imgtec.com> Date: Thu Dec 7 16:03:22 2017 +0000 meson: dedup gallium-va logic Signed-off-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Dylan Baker <dy...@pnwbakers.com> (cherry picked from commit fa5d616bf907bedda6904cdff98832d9c8c59770) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=672467cb5960ea094e708c3a857230fbaf7f42f5 Author: Eric Engestrom <eric.engest...@imgtec.com> Date: Thu Dec 7 16:03:04 2017 +0000 meson: dedup gallium-omx logic Signed-off-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Dylan Baker <dy...@pnwbakers.com> (cherry picked from commit 86168ed31c52ca5be3b618a5aae2e5d8990f4c31) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec91477aa75b6d7fe40819470ae5c8c136f19c47 Author: Eric Engestrom <eric.engest...@imgtec.com> Date: Thu Dec 7 16:02:29 2017 +0000 meson: dedup gallium-xvmc logic Signed-off-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Dylan Baker <dy...@pnwbakers.com> (cherry picked from commit 724916c8a84b5bba8f880f17da936585d52c97b6) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=eb1aac3f4f5a7074a8787e257a902c03fe2bb20d Author: Eric Engestrom <eric.engest...@imgtec.com> Date: Thu Dec 7 16:02:02 2017 +0000 meson: dedup gallium-vdpau logic Signed-off-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Dylan Baker <dy...@pnwbakers.com> (cherry picked from commit 992af0a4b8224bdb4809e01c2f00d2f32546aee5) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=96d3fbc96621ea735164f09cb74c86aa1f915669 Author: Dylan Baker <dy...@pnwbakers.com> Date: Mon Feb 12 11:03:47 2018 -0800 meson: add libswdri and libswkmsdri to dri link_with Fixes: b154b44ae342 ("meson: build radeonsi gallium driver") Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Acked-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit 8eb608df61912cfd0633fe982b140e22e7563770) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2665a124e8696af81b450131cb4322b9b21bafa4 Author: Dylan Baker <dy...@pnwbakers.com> Date: Mon Feb 12 10:58:58 2018 -0800 meson: add libswdri and libswkmsdri to d3dadaptor link_with v5: - Fix libswdi -> libswdri typo Fixes: 6b4c7047d571 ("meson: build gallium nine state_tracker") Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Acked-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit be879f9f290c5277097ec82ffb7d8d2de2e2707a) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a77e6f43137de81b4cd5a5d378b4ad3eeb02f96b Author: Dylan Baker <dy...@pnwbakers.com> Date: Mon Feb 12 10:46:06 2018 -0800 meson: define empty variables for libswdri and libswkmsdri This allows these variables to unconditionally included in `link_with` lists, even if they're not used. This allows deleting duplicated logic in nearly every gallium target implemented in meson today. This also removes the now useless `build_by_default` flag from swdri and swkmsdri. v4: - add this patch Fixes: 66c94b9313a697ce8f2b222f4ba353035e4b8726 ("meson: build gallium winsys for dri, null, and wrapper") Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Acked-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit d672084ba29a64f5ec8c9cd23d4b77c0efa05693) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=61e47c158dd3e259d04c291eadb125f9819aa6a8 Author: Dylan Baker <dy...@pnwbakers.com> Date: Tue Jan 23 09:39:25 2018 -0800 meson: use depend_files for adding extra file dependencies cc: Jason Ekstrand <jason.ekstr...@intel.com> Fixes: dd088d4bec74f37ffe4 ("anv/extensions: Generate a header file with extension tables") Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Reviewed-by: Samuel Iglesias Gonsálvez <sigles...@igalia.com> (cherry picked from commit 0e617c04f16563381b3d9bd1ddd092e32e38a843) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=411a13d45526c8b44c8e7c226b7e951e679c19cb Author: Dylan Baker <dy...@pnwbakers.com> Date: Tue Jan 23 09:37:03 2018 -0800 meson: use depend_files to track extra file dependencies cc: Jason Ekstrand <jason.ekstr...@intel.com> Fixes: f93994080993bda ("anv: Split anv_extensions.py into two files") Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Reviewed-by: Samuel Iglesias Gonsálvez <sigles...@igalia.com> (cherry picked from commit b03969a5adeffaceec7ff722e90205c4284b1f1e) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=daba407e80e31b4ac8626bb7aafd20144482d1b3 Author: Dylan Baker <dy...@pnwbakers.com> Date: Tue Jan 23 09:34:53 2018 -0800 Revert "anv/meson: Make anv_entrypoints_gen.py depend on anv_extensions.py" This reverts commit 10d1b0be8e9c463dbc35cd66968299f33c76672c. This is unnecessary, the depend_files argument is for adding dependencies on files that are not part of the input, which is already done. cc: Jason Ekstrand <jason.ekstr...@intel.com> Fixes: 10d1b0be8e9c463dbc35cd66968299f33c76672c Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Reviewed-by: Samuel Iglesias Gonsálvez <sigles...@igalia.com> (cherry picked from commit 384bff13e034bcca06eec1bdf50a3913f9e941db) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=17d1c9dc185522b546bb54003a000876ac7c7257 Author: Dylan Baker <dy...@pnwbakers.com> Date: Mon Feb 12 11:53:55 2018 -0800 meson: use a custom target instead of a generator for i965 oa Generators really are never the thing you want. The problem in this case is that a generator must create a file that contains any file that the generated target depends on. Since brw_oa.py doesn't generate such a file the generated sources are not regenerated even if the xml files they should depend on changes. While we could change brw_oa.py to write such a file, that's silly, it depends on itself and the xml file. So we'll just use a custom target instead, which will have the correct dependency behavior and doesn't really add that much code. Fixes: 3218056e0eb3 ("meson: Build i965 and dri stack") CC: Ian Romanick <i...@freedesktop.org> Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Acked-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> (cherry picked from commit 5317211fa029ee8d0e1c802ef8c01f64c470e3d5) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=398477a30d8ecaf74e79a59ff03f30fa809afa16 Author: Brian Paul <bri...@vmware.com> Date: Tue Feb 13 09:21:45 2018 -0700 mesa: add missing switch case for EXTRA_VERSION_40 in check_extra() The EXTRA_VERSION_40 predicate is tested as part of extra_gl40_ARB_sample_shading but there was no switch case for it. Fixes: 77b440e42d8e7247c2295 ("mesa: Add new functions and enums required by GL_ARB_sample_shading") Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com> (cherry picked from commit b08d718703bc907d9cb99887f90ea80d7e91dc45) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=87c9aaa1d540b6e34e84cc68c1d0c0e34af54627 Author: Eric Anholt <e...@anholt.net> Date: Sat Feb 10 11:01:20 2018 +0000 glsl/tests: Fix strict aliasing warning about int64/double. Fixes: 4bf986274728 ("glsl/tests: Add UINT64 and INT64 types") Reviewed-by: Rhys Kidd <rhysk...@gmail.com> (cherry picked from commit 21670f820812238dbe3fb18ab90493999b7e718e) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9c8707957eb7be0753735552a721af6fa53f56bb Author: Eric Anholt <e...@anholt.net> Date: Sat Feb 10 10:37:37 2018 +0000 ac/nir: Fix compiler warning about uninitialized dw_addr. Even switching the def's condition to be the same chip revision check as the use, the compiler doesn't figure it out. Just NULL-init it. Fixes: ec53e527421d ("ac/nir: Add ES output to LDS for GFX9.") Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> (cherry picked from commit 091bff831721b62243840038f505af0abd9436c1) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d0255432362f0e8c85787f4cdf26872d87e08009 Author: Daniel Stone <dani...@collabora.com> Date: Tue Feb 6 09:45:01 2018 +0000 egl/wayland: Fix ARGB/XRGB transposition in config map When 0b2b7191214eb moved from an if tree to a struct to map between wl_drm formats and EGLConfigs, it transposed the mapping between XRGB and ARGB. Luckily, everyone exposes both formats, so this is harmless. Signed-off-by: Daniel Stone <dani...@collabora.com> Fixes: 0b2b7191214eb ("egl/wayland: introduce dri2_wl_add_configs_for_visuals() helper") Reviewed-by: Emil Velikov <emil.veli...@collabora.com> Reviewed-by: Eric Engestrom <e...@engestrom.ch> Tested-by: Ilia Mirkin <imir...@alum.mit.edu> (cherry picked from commit 4fbd2d50b1c06a3c10f3a254e933646345123751) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c86fee1b2cc583facf39a95874fad8d440980818 Author: Grazvydas Ignotas <nota...@gmail.com> Date: Sat Feb 3 23:42:28 2018 +0200 gallium/hud: update some query functions It seems these were missed when struct pipe_context * argument was added to hud_graph::query_new_value. Fixes: 3132afdf4c "gallium/hud: pass pipe_context explicitly to most functions" Reviewed-by: Marek Olšák <marek.ol...@amd.com> (cherry picked from commit 13ada91740769a3183f21d974193769262f5ee0f) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d658dc8f4de430d489c0a5c3ba6abdb44df87b0b Author: Dylan Baker <dy...@pnwbakers.com> Date: Mon Nov 20 14:55:13 2017 -0800 glapi: fix check_table test for non-shared glapi with meson v2: - Add glapitable_h generated source to requirements Fixes: 3218056e0eb3 ("meson: Build i965 and dri stack") Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com> (v1) Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (v1) (cherry picked from commit c74719cf4adae2fa142e154bff56716427d3d992) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ada6af733007cfccea148bfed1c7cfa016a2ad62 Author: Dylan Baker <dy...@pnwbakers.com> Date: Mon Nov 20 14:39:27 2017 -0800 glapi: remove APPLE extensions from test Fixes: 7009955281260fbb ("mesa: Remove GL_APPLE_vertex_array_object stubs") Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com> Acked-by: Ian Romanick <ian.d.roman...@intel.com> (cherry picked from commit 0316aa432d467a3e747e37e721be62301c42ff8c) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b26d2238ea1692295fe7888c52c0dc8b8c651102 Author: Dylan Baker <dy...@pnwbakers.com> Date: Mon Nov 20 10:05:25 2017 -0800 glapi/check_table: Remove 'extern "C"' block Using 'extern "C"' around includes is always incorrect, as the header may contain C++ symbols (as it does in this case), which means it cannot use C linkage. In this case the header has a template in it, which obviously cannot be linked with C linkage rules. Fixes: a29ad2b421b75a1727b ("mesa/tests: Add tests for the generated dispatch table") Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit a4f1fc5dd197a0cd107b6a96a222ace4105680dd) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=08135dcbc0847c037ac06d3b5f17281529ab0f3d Author: Dylan Baker <dy...@pnwbakers.com> Date: Tue Nov 7 16:00:34 2017 -0800 meson: fix test source name for static glapi fixes: 43a6e84927e3 ("meson: build mesa test.") Signed-off-by: Dylan Baker <dylanx.c.ba...@intel.com> Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit 105178db8f5d7d45b268c7664388d7db90350704) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3a3e55e5f73f7c1aa891f10740b9c861bec4bb39 Author: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> Date: Tue Feb 6 15:43:36 2018 +0100 vulkan/wsi: Fix OOM behavior with prime images. Fixes: d50937f137 "vulkan/wsi: Implement prime in a completely generic way" Reviewed-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit a3e42e7a69600f0a14f08a7f370aabb85d5a8632) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fcb04fee1c7b86bdb868213de92c763389e788dd Author: Dave Airlie <airl...@redhat.com> Date: Tue Feb 6 19:37:48 2018 +0000 radv: don't support tc-compat on multisample d32s8 at all. RX550 fails dEQP-VK.renderpass.suballocation.multisample.d32_sfloat_s8_uint.samples_2 So increase the range of the workaround. Fixes: f4c534ef6 (radv: don't enable tc compat for d32s8 + 4/8 samples (v1.1)) Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit e7e81f362d6dc4fe3a272cdd07724a26391e8f5e) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=faebf982757a753c6a2205ae0a26eb2551b27421 Author: Chuck Atkins <chuck.atk...@kitware.com> Date: Thu Feb 22 09:19:37 2018 -0500 glx: Properly handle cases where screen creation fails This fixes a segfault exposed by a29d63ecf7 which occurs when swr is used on an unsupported architecture. v2: re-work to place logic in xmesa_init_display Signed-off-by: Chuck Atkins <chuck.atk...@kitware.com> Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com> Cc: mesa-sta...@lists.freedesktop.org Cc: George Kyriazis <george.kyria...@intel.com> Cc: Bruce Cherniak <bruce.chern...@intel.com> (cherry picked from commit 540e49e1054d60f5f3809b6efc828ac4cac8c708) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd8e9517ef03695b4dcfaf063b5d7558c845bd8d Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Wed Feb 21 12:38:12 2018 -0800 vulkan/wsi/x11: Set OUT_OF_DATE if wait_for_special_event fails This most likely means we lost our connection to the X server so OUT_OF_DATE is reasonable. This was also the one case where we pushed a UINT32_MAX into the queue without setting an error condition. Cc: mesa-sta...@lists.freedesktop.org Reviewed-by: Daniel Stone <dani...@collabora.com> (cherry picked from commit 6937c613242d646b8c37f01ffd6a02a9b64c8d6c) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=72796340e4699c0cdc11707de5a73833a4714ed9 Author: Dave Airlie <airl...@redhat.com> Date: Tue Feb 20 10:15:18 2018 +1000 ac/nir: to integer the args to bcsel. dEQP-VK.tessellation.invariance.outer_edge_symmetry.triangles_equal_spacing_ccw was hitting an llvm assert due to one value being an int and the other a float. This just casts both values to integer and fixes the test. Fixes: dEQP-VK.tessellation.invariance.outer_edge_symmetry.triangles_equal_spacing_ccw Cc: mesa-sta...@lists.freedesktop.org Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit d5b2d7ed670e6b6a2d7a96e588cb3de852d0b289) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5b6b4e4f3871f9d3ba64ea2ca2921c3d722b47cd Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Mon Feb 12 15:50:12 2018 -0800 intel/isl: Add an isl_color_value_is_zero helper Cc: mesa-sta...@lists.freedesktop.org Reviewed-by: Nanley Chery <nanley.g.ch...@intel.com> (cherry picked from commit 4796025ba518baa0e8893337591a3f452a375d94) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=03d801a1761d480654369d88bfecb0b3eb4c63a7 Author: Jonathan Gray <j...@jsg.id.au> Date: Tue Feb 20 17:38:00 2018 +1100 configure.ac: pthread-stubs not present on OpenBSD pthread-stubs is no longer required on OpenBSD and has been removed. libpthread parts involved moved to libc. Signed-off-by: Jonathan Gray <j...@jsg.id.au> Cc: 17.3 18.0 <mesa-sta...@lists.freedesktop.org> Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit 9401d90a537f0db62e726eeffe468a64189550f1) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f4e01dd22382fd8466d5628033562f84a1abc136 Author: Thomas Hellstrom <thellst...@vmware.com> Date: Fri Feb 9 09:37:19 2018 +0100 loader_dri3/glx/egl: Reinstate the loader_dri3_vtable get_dri_screen callback Removing this callback caused rendering corruption in some multi-screen cases, so it is reinstated but without the drawable argument which was never used by implementations and was confusing since the drawable could have been created with another screen. Cc: "17.3 18.0" mesa-sta...@lists.freedesktop.org Fixes: 5198e48a0d (loader_dri3/glx/egl: Remove the loader_dri3_vtable get_dri_screen callback) Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105013 Reported-by: Daniel van Vugt <daniel.van.v...@canonical.com> Tested-by: Timo Aaltonen <tjaal...@ubuntu.com> Signed-off-by: Thomas Hellstrom <thellst...@vmware.com> Reviewed-by: Brian Paul <bri...@vmware.com> (cherry picked from commit f386776ea55f86d0288c955cf4cf877a1b4a027d) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f75a99501b2c71fe343662555e4f18deb02bbaa0 Author: Thomas Hellstrom <thellst...@vmware.com> Date: Mon Jan 15 12:51:27 2018 +0100 svga: Fix a leftover debug hack Fix what appears to be a leftover debug hack. The hack would force the driver to take a different blit path; possibly, although unverified, reverting to software blits. Tested using piglit tests/quick. No related regressions. Cc: "17.2 17.3 18.0" <mesa-sta...@lists.freedesktop.org> Fixes: 9d81ab7376 (svga: Relax the format checks for copy_region_vgpu10 somewhat) Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104625 Reported-by: Grazvydas Ignotas <nota...@gmail.com> Signed-off-by: Thomas Hellstrom <thellst...@vmware.com> Reviewed-by: Brian Paul <bri...@vmware.com> (cherry picked from commit 80c31f7837cd319910d94d780f5048de6cce0adb) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=98dd3e1bf199cd0d4f5c3fc22e1a871d3b34740c Author: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> Date: Thu Feb 15 21:24:35 2018 +0100 radv: Always lower indirect derefs after nir_lower_global_vars_to_local. Otherwise new local variables can cause hangs on vega. CC: <mesa-sta...@lists.freedesktop.org> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105098 Reviewed-by: Timothy Arceri <tarc...@itsqueeze.com> (cherry picked from commit 05d84ed68add9e6adfcc602a274405e04226c1b7) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b2966d5693c65d0b8cc5b36b2ec22edd18b34472 Author: Gurchetan Singh <gurchetansi...@chromium.org> Date: Wed Feb 14 15:40:35 2018 -0800 mesa: don't clamp just based on ARB_viewport_array extension The ARB_viewport_array spec says: "Dependencies OpenGL 1.0 is required. OpenGL 3.2 or the EXT_geometry_shader4 or ARB_geometry_shader4 extensions are required. This extension is written against the OpenGL 3.2 (Compatibility) Specification." As such, we should ignore it for GLES2 contexts. Fixes: dEQP-GLES2.functional.state_query.integers.viewport_getinteger dEQP-GLES2.functional.state_query.integers.viewport_getfloat on llvmpipe and virgl. v2: Use _mesa_has_* (Ilia) Signed-off-by: Marek Olšák <marek.ol...@amd.com> Cc: 17.3 18.0 <mesa-sta...@lists.freedesktop.org> (cherry picked from commit c6694793e1148f920a94eb54db11cead1662c2da) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=91fe9566832cc8cc65925654b45a5b7ba70b752d Author: Anuj Phogat <anuj.pho...@gmail.com> Date: Fri Jun 30 10:29:23 2017 -0700 isl: Don't use surface format R32_FLOAT for typed atomic integer operations From Skylake PRM Surface Formats section: "The surface format for the typed atomic integer operations must be R32_UINT or R32_SINT." Fixes an error and a piglit GPU hang in simulation environment. Piglit test: gl45-imageAtomicExchange-float.shader_test Suggested-by: Francisco Jerez <curroje...@riseup.net> Signed-off-by: Anuj Phogat <anuj.pho...@gmail.co Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> Cc: "18.0 17.3" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit 0cd37f9178d79ed62f1952939e1044cda5701a3a) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=767c97583d267a397eb7dd2e7601d9718d2ba56f Author: Rafael Antognolli <rafael.antogno...@intel.com> Date: Tue Feb 13 13:48:26 2018 -0800 docs: Add Cannonlake support to 18.0 release notes. 17.4 is actually 18.0. Signed-off-by: Rafael Antognolli <rafael.antogno...@intel.com> Cc: "18.0" mesa-sta...@lists.freedesktop.org Reviewed-by: Anuj Phogat <anuj.pho...@gmail.com> Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> (cherry picked from commit eb2e17e2d15bf58b60460437330d719131fb859e) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf972691cc58a504111cf4ac136ee4b60049ccc3 Author: Rafael Antognolli <rafael.antogno...@intel.com> Date: Tue Feb 13 13:18:08 2018 -0800 anv/gen10: Remove warning message. Gen10 seems pretty stable so far, remove "alpha support" message. 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: Anuj Phogat <anuj.pho...@gmail.com> Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> (cherry picked from commit fcae3d1a9acc080bf31cf7b5c4d0b18e67319b09) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8d56352851b583292db0e0264c5993fd391dcbc1 Author: Rafael Antognolli <rafael.antogno...@intel.com> Date: Tue Feb 13 13:13:24 2018 -0800 i965/gen10: Remove warning message. Gen10 seems pretty stable so far, so there's no reason to keep this message. 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: Anuj Phogat <anuj.pho...@gmail.com> Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> (cherry picked from commit bf1577fe0972ae910c071743dc89d261a46c2926) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e4820a98374b9f7fdb3af52f48e1a8261f51e489 Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Mon Feb 12 08:17:57 2018 -0800 anv: Move setting current_pipeline to cmd_state_init We were setting current_pipeline to UINT32_MAX and then calling cmd_cmd_state_reset which memsets the entire state struct to 0 which implicitly resets current_pipeline to 3D. I have no idea how this hasn't caused everything to explode. Fixes: cd3feea74582 "anv/cmd_buffer: Rework anv_cmd_state_reset" cc: mesa-sta...@lists.freedesktop.org Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> (cherry picked from commit 4c77e21c814145e845bac64cce40eadfd7ac0bd9) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=524fa503d1f5e6668f1761375133ce120b1cee92 Author: Daniel Stone <dani...@collabora.com> Date: Mon Feb 12 17:54:41 2018 +0000 i965: Fix bugs in intel_from_planar This commit fixes two bugs in intel_from_planar. First, if the planar format was non-NULL but only had a single plane, we were falling through to the planar case. If we had a CCS modifier and plane == 1, we would return NULL instead of the CCS plane. Second, if we did end up in the planar_format == NULL case and the modifier was DRM_FORMAT_MOD_INVALID, we would end up segfaulting in isl_drm_modifier_has_aux. Cc: mesa-sta...@lists.freedesktop.org Fixes: 8f6e54c92966bb94a3f05f2cc7ea804273e125ad Signed-off-by: Daniel Stone <dani...@collabora.com> Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> (cherry picked from commit c2c4e5bae3ba27bbdaafd8787a3e96266f82e70c) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c0d3b2db86dbafa2c99da4a5139e6a16b3509f74 Author: Lionel Landwerlin <lionel.g.landwer...@intel.com> Date: Tue Feb 6 23:23:22 2018 +0000 i965: perf: use drmIoctl() instead of ioctl() ioctl() might be interrupted, use drmIoctl() instead as it'll retry automatically. Fixes: 27ee83eaf7e "i965: perf: add support for userspace configurations" Cc: "18.0" <mesa-sta...@lists.freedesktop.org> Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Reviewed-by: Tapani Pälli <tapani.pa...@intel.com> Tested-by: Mark Janes <mark.a.ja...@intel.com> (cherry picked from commit bd6c0cab606fa0a3b821e50542ba06ff714292bf) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d2fcdaf504c524488ab378f831504a02448afd9a Author: Dave Airlie <airl...@redhat.com> Date: Mon Feb 5 13:09:57 2018 +1000 r600: fix xfb stream check. This fixes: KHR-GL45.enhanced_layouts.xfb_vertex_streams Reviewed-by: Roland Scheidegger <srol...@vmware.com> Cc: <mesa-sta...@lists.freedesktop.org> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit f292eceae1d3bc0462d626d6857dbf51c48fbc92) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec2b454d8686f8cd338389c1f68c26394e0f7de0 Author: Dave Airlie <airl...@redhat.com> Date: Mon Feb 5 10:14:19 2018 +1000 r600/compute: only mark buffer/image state dirty for fragment shaders The compute emission path always emits this currently, and emitting it on the fragment path breaks the blitter. This fixes gpu hangs in KHR-GL45.compute_shader.resource-texture Reviewed-by: Roland Scheidegger <sorl...@vmware.com> Cc: <mesa-sta...@lists.freedesktop.org> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit ab5cee4c241cb360cf67101dd751e0f38637b526) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd2ea3a3e93d48a174aa4acafd08bba10d6641a2 Author: Dave Airlie <airl...@redhat.com> Date: Mon Feb 5 16:04:18 2018 +1000 r600/sb/cayman: fix indirect ubo access on cayman With sb enabled on cayman, this was overwriting the proper cf index value with random ones if the dst gpr was 2 or 3, only save the value for a MOVA instruction. Fixes: KHR-GL45.gpu_shader5.uniform_blocks_array_indexing (on cayman with sb) Cc: <mesa-sta...@lists.freedesktop.org> Reviewed-by: Roland Scheidegger <srol...@vmware.com> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 8bdad9fa1faf3fa258a7731605e8b2bf218a33bd) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e8f3951e2e8c057d31ccb3e219027a6c7809939e Author: Dave Airlie <airl...@redhat.com> Date: Fri Feb 2 15:17:57 2018 +1000 r600/eg: use texture target to pick array size not view target (v2) This fixes a few CTS cases in : KHR-GL45.texture_view.view_sampling some multisample cases are still broken, but not sure this is the same problem. v2: fix more cases Cc: <mesa-sta...@lists.freedesktop.org> Reviewed-by: Roland Scheidegger <srol...@vmware.com> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 012100b80936325945f24a580f643e535028fe19) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8d186473ea5e644def16f0b6e2809bd58d990438 Author: Michal Navratil <f.jo...@email.cz> Date: Sun Feb 4 20:24:02 2018 +0100 winsys/amdgpu: allow non page-aligned size bo creation from pointer Fix INVALID_OPERATION caused by BufferData with target EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD when the buffer size is not page aligned. Signed-off-by: Marek Olšák <marek.ol...@amd.com> Cc: 17.3 18.0 <mesa-sta...@lists.freedesktop.org> (cherry picked from commit 4081e088962315b5c3f4e7030868faf01e7c4a69) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=758355b34c073dd8d4f9ee3558f899a0747b3577 Author: Iago Toral Quiroga <ito...@igalia.com> Date: Mon Feb 5 09:49:54 2018 +0100 anv/device: initialize the list of enabled extensions properly The loop goes through the list of enabled extensions marking them as enabled in the list, but this relies on every other extension being initialized to false by default. This bug would make us, for example, advertise certain device extension entry points as available even when the corresponding extensions had not been enabled. Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> Fixes: abc62282b5c "anv: Add a per-device table of enabled extensions" Cc: "18.0" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit a5053ba27ed76f666e315de7150433c5aaaaf2c3) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7adc454c94b1241106c0fd7147c04686352a53c2 Author: Juan A. Suarez Romero <jasua...@igalia.com> Date: Mon Feb 5 17:38:39 2018 +0100 glsl/linker: check same name is not used in block and outside According with OpenGL GLSL 3.20 spec, section 4.3.9: "It is a link-time error if any particular shader interface contains: - two different blocks, each having no instance name, and each having a member of the same name, or - a variable outside a block, and a block with no instance name, where the variable has the same name as a member in the block." This fixes a previous commit 9b894c8 ("glsl/linker: link-error using the same name in unnamed block and outside") that covered this case, but did not take in account that precision qualifiers are ignored when comparing blocks with no instance name. With this commit, the original tests KHR-GL*.shaders.uniform_block.common.name_matching keep fixed, and also dEQP-GLES31.functional.shaders.linkage.uniform.block.differing_precision regression is fixed, which was broken by previous commit. v2: use helper varibles (Matteo Bruni) Fixes: 9b894c8 ("glsl/linker: link-error using the same name in unnamed block and outside") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104668 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104777 CC: Mark Janes <mark.a.ja...@intel.com> CC: "18.0" <mesa-sta...@lists.freedesktop.org> Tested-by: Matteo Bruni <matteo.myst...@gmail.com> Reviewed-by: Tapani Pälli <tapani.pa...@intel.com> Signed-off-by: Juan A. Suarez Romero <jasua...@igalia.com> (cherry picked from commit 4195eed961ccfe404ae81b9112189fc93a254ded) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0354ff27e713705a15e4336b825c30b48dba79d2 Author: Emil Velikov <emil.veli...@collabora.com> Date: Thu Feb 22 18:47:27 2018 +0000 cherry-ignore: reference correct SHA for the VK_KHX_multiview commit Signed-off-by: Emil Velikov <emil.veli...@collabora.com> _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit