Timo Aaltonen pushed to branch debian-experimental at X Strike Force / lib / mesa
Commits: a5f16a42 by Marek Olšák at 2019-02-20T16:13:24Z radeonsi: add driconf option radeonsi_enable_nir Cc: 18.3 19.0 <mesa-sta...@lists.freedesktop.org> Reviewed-by: Timothy Arceri <tarc...@itsqueeze.com> (cherry picked from commit ccbfe44e5ff88a19451701561f752c6046677122) - - - - - c837cd65 by Marek Olšák at 2019-02-20T16:13:34Z radeonsi: always enable NIR for Civilization 6 to fix corruption Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104602 Cc: 18.3 19.0 <mesa-sta...@lists.freedesktop.org> Reviewed-by: Timothy Arceri <tarc...@itsqueeze.com> (cherry picked from commit ae21bdf47cacafdf69b904cbf3e433cbe0cccb84) - - - - - dd03e1d5 by Marek Olšák at 2019-02-20T16:13:50Z driconf: add Civ6Sub executable for Civilization 6 I'm getting Civ6Sub instead of Civ6. Cc: 18.3 19.0 <mesa-sta...@lists.freedesktop.org> Reviewed-by: Timothy Arceri <tarc...@itsqueeze.com> (cherry picked from commit bff8da6c591e55e4b5f04aea1fef29e6230e9222) - - - - - 2ea2b227 by Mario Kleiner at 2019-02-20T16:14:01Z drirc: Add sddm-greeter to adaptive_sync blacklist. This is the sddm login screen. Fixes: a9c36dbf9c56 ("drirc: Initial blacklist for adaptive sync") Signed-off-by: Mario Kleiner <mario.kleiner...@gmail.com> Cc: 19.0 <mesa-sta...@lists.freedesktop.org> Signed-off-by: Marek Olšák <marek.ol...@amd.com> (cherry picked from commit afb15d14ca19ea321280bb83215af4c55b9ce881) - - - - - 73fa079b by Bas Nieuwenhuizen at 2019-02-20T16:14:13Z radv: Sync ETC2 whitelisted devices. Fixes: 4bb6c49375e "radv: Allow ETC2 on RAVEN and VEGA10 instead of all GFX9." Reviewed-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 7631feaa0040616585cf69b52241d2b06b82b524) - - - - - c4799332 by Carlos Garnacho at 2019-02-20T16:14:21Z wayland/egl: Ensure EGL surface is resized on DRI update_buffers() Fullscreening and unfullscreening a totem window while playing a video sometimes results in the video subsurface not changing size along. This is also reproducible with epiphany. If a surface gets resized while we have an active back buffer for it, the resized dimensions won't get neither immediately applied on the resize callback, nor correctly synchronized on update_buffers(), as the (now stale) surface size and currently attached buffer size still do match. There's actually 2 things to synchronize here, first the surface query size might not be updated yet to the wl_egl_window's (i.e. resize_callback happened while there is a back buffer), and second the wayland buffers would need dropping if new surface size differs with the currently attached buffer. These are done in separate steps now. https://bugzilla.redhat.com/show_bug.cgi?id=1650929 https://bugs.freedesktop.org/show_bug.cgi?id=109594 Fixes: a9fb331ea7d ("wayland/egl: update surface size on window resize") Signed-off-by: Carlos Garnacho <carl...@gnome.org> Reviewed-by: Juan A. Suarez <jasua...@igalia.com> Reviewed-by: Daniel Stone <dani...@collabora.com> Tested-by: Bastien Nocera <had...@hadess.net> Tested-by: Denys Kostin <denys.kos...@globallogic.com> (cherry picked from commit 30a01cd9232ed83a0259d184b82e050bae219ed3) - - - - - 6abb6bd8 by Rodrigo Vivi at 2019-02-20T16:19:31Z intel: Add more PCI Device IDs for Coffee Lake and Ice Lake. Align with kernel commits: 5e0f5a58b167 ("drm/i915/cfl: Adding another PCI Device ID.") 03ca3cf8e9aa ("drm/i915/icl: Adding few more device IDs for Ice Lake") Cc: José Roberto de Souza <jose.so...@intel.com> Cc: Kenneth Graunke <kenn...@whitecape.org> Cc: Anuj Phogat <anuj.pho...@gmail.com> Signed-off-by: Rodrigo Vivi <rodrigo.v...@intel.com> Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> (cherry picked from commit 56c3b4971d44748ad8618efdf8833ec2f9af4078) - - - - - 4cfdd5a1 by Andrii Simiklit at 2019-02-25T17:13:48Z i965: re-emit index buffer state on a reset option change. Seems like we forget to update the index buffer (ib) status and IndexedDrawCutIndexEnable or CutIndexEnable flag is left unchanged it leads to ignoring of glEnable/glDisable functions for GL_PRIMITIVE_RESTART in some cases. The index buffer (ib) status should be re-emmited after the reset option change to avoid some unexpected behavior. Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109451 Cc: <mesa-sta...@lists.freedesktop.org> Signed-off-by: Andrii Simiklit <andrii.simik...@globallogic.com> Signed-off-by: Andrii Simiklit <asimiklit.w...@gmail.com> (cherry picked from commit f4f4ec941e1427142656e588244f378e469e996e) - - - - - d45d3576 by Francisco Jerez at 2019-02-25T21:26:35Z intel/fs: Exclude control sources from execution type and region alignment calculations. Currently the execution type calculation will return a bogus value in cases like: mov_indirect(8) vgrf0:w, vgrf1:w, vgrf2:ud, 32u Which will be considered to have a 32-bit integer execution type even though the actual indirect move operation will be carried out with 16-bit precision. Similarly there's no need to apply the CHV/BXT double-precision region alignment restrictions to such control sources, since they aren't directly involved in the double-precision arithmetic operations emitted by these virtual instructions. Applying the CHV/BXT restrictions to control sources was expected to be harmless if mildly inefficient, but unfortunately it exposed problems at codegen level for virtual instructions (namely the SHUFFLE instruction used for the Vulkan 1.1 subgroup feature) that weren't prepared to accept control sources with an arbitrary strided region. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109328 Reported-by: Mark Janes <mark.a.ja...@intel.com> Fixes: efa4e4bc5fc "intel/fs: Introduce regioning lowering pass." Tested-by: Anuj Phogat <anuj.pho...@gmail.com> Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> (cherry picked from commit c3c27762f787a93ee3f27189bef8d7cdcb3a6cab) - - - - - 32e2f645 by Francisco Jerez at 2019-02-25T21:26:35Z intel/fs: Implement extended strides greater than 4 for IR source regions. Strides up to 32B can be implemented for the source regions of most instructions by leveraging either the vertical or the horizontal stride of the hardware Align1 region. The main motivation for this is that currently the lower_integer_multiplication() pass will happily double the stride of one of the 32-bit sources, which can blow up if the stride of the original source was already the maximum value allowed by the hardware. An alternative would be to use the regioning legalization pass in order to lower such strides into the composition of multiple legal strides, but that would be somewhat less efficient. This showed up as a regression from my commit cbea91eb57a501bebb1ca2 in Vulkan 1.1 CTS tests on CHV/BXT platforms, however it was really a pre-existing problem that had affected conformance on other platforms without native support for integer multiplication. CHV/BXT were getting around it because the code I removed in that commit had the "fortunate" side effect of emitting narrower regions that didn't hit the hardware stride limit after lowering. Beyond fixing the regression this fixes ~90 additional Vulkan 1.1 subgroup CTS tests on ICL (that's why this patch is marked for inclusion in mesa-stable even though the original regressing patch was not). According to Jason, a nearly equivalent change had been committed previously as e8c9e65185de3e821e1 and then (mistakenly?) reverted as a31d0382084c8aa8. Cc: mesa-sta...@lists.freedesktop.org Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109328 Reported-by: Mark Janes <mark.a.ja...@intel.com> Tested-by: Anuj Phogat <anuj.pho...@gmail.com> Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> (cherry picked from commit e03be78252afa8f1033b0824eff8d48df4fd6727) - - - - - 641884c8 by Lionel Landwerlin at 2019-02-25T21:26:35Z intel: fix urb size for CFL GT1 Same 192Kb amount as SKL/KBL GT1 applies. Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Reviewed-by: Anuj Phogat <anuj.pho...@gmail.com> Fixes: de7ed0ba5522 ("i965/CFL: Add PCI Ids for Coffee Lake.") (cherry picked from commit 1d626fc02895daa9e7f7c74a829b9512f08869e8) - - - - - be1200d6 by Juan A. Suarez Romero at 2019-02-25T21:26:35Z genxml: add missing field values for 3DSTATE_SF Fill out "Vertex Sub Pixel Precision Select" possible values. CC: 18.3 19.0 <mesa-sta...@lists.freedesktop.org> Signed-off-by: Juan A. Suarez Romero <jasua...@igalia.com> Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> (cherry picked from commit 3b423eeb2d326418147fdfbdc89a415e44a557d3) - - - - - 9f5622fe by Juan A. Suarez Romero at 2019-02-25T21:26:35Z anv: advertise 8 subpixel precision bits On one side, when emitting 3DSTATE_SF, VertexSubPixelPrecisionSelect is used to select between 8 bit subpixel precision (value 0) or 4 bit subpixel precision (value 1). As this value is not set, means it is taking the value 0, so 8 bit are used. On the other side, in the Vulkan CTS tests, if the reference rasterizer, which uses 8 bit precision, as it is used to check what should be the expected value for the tests, is changed to use 4 bit as ANV was advertising so far, some of the tests will fail. So it seems ANV is actually using 8 bits. v2: explicitly set 3DSTATE_SF::VertexSubPixelPrecisionSelect (Jason) v3: use _8Bit definition as value (Jason) v4: (by Jason) anv: Explicitly set 3DSTATE_CLIP::VertexSubPixelPrecisionSelect This field was added on gen8 even though there's an identically defined one in 3DSTATE_SF. CC: Jason Ekstrand <ja...@jlekstrand.net> CC: Kenneth Graunke <kenn...@whitecape.org> CC: 18.3 19.0 <mesa-sta...@lists.freedesktop.org> Signed-off-by: Juan A. Suarez Romero <jasua...@igalia.com> Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> (cherry picked from commit 4f917e6a61860b58a05d40584f7aa3d5e4e32b75) - - - - - 1d4fbff7 by Marek Olšák at 2019-02-25T21:26:36Z tgsi: don't set tgsi_info::uses_bindless_images for constbufs and hw atomics This might have decreased performance for radeonsi/tgsi, because most most shaders claimed they used bindless. Cc: 18.3 19.0 <mesa-sta...@lists.freedesktop.org> Reviewed-by: Ilia Mirkin <imir...@alum.mit.edu> (cherry picked from commit b326a15edab34d09e7b328dd8726137960ae12a5) - - - - - 06889aaa by Alok Hota at 2019-02-25T21:26:36Z swr/rast: bypass size limit for non-sampled textures This fixes a bug where SWR will fail to render in cases with large buffer allocations, e.g. very large meshes whose vertex buffers exceed 2GB CC: <mesa-sta...@lists.freedesktop.org> Reviewed-by: Bruce Cherniak <bruce.chern...@intel.com> (cherry picked from commit 6053499f2eafde606b13a9663016e9be8e4089eb) - - - - - edeb13b5 by David Shao at 2019-02-25T21:26:36Z meson: ensure that xmlpool_options.h is generated for gallium targets that need it Fixes: 68076b87474e7959c161 "meson: build gallium vdpau state tracker" Fixes: 22a817af8a89eb3c762f "meson: build gallium xvmc state tracker" Fixes: 5a785d51a6d68ec676ce "meson: build gallium va state tracker" Fixes: 0ba909f0f111824223bc "meson: build gallium xa state tracker" Fixes: 1d36dc674d528b93bec3 "meson: build gallium omx state tracker" Reviewed-by: Eric Engestrom <eric.engest...@intel.com> (cherry picked from commit 6fa923a65daf1ee73c5cc763ade91abc82da7085) - - - - - 697c6c5a by Sergii Romantsov at 2019-02-25T21:26:36Z dri: meson: do not prefix user provided dri-drivers-path The user can select the location where there dri drivers are installed by the dri-drivers-path meson option. By default path will be $prefix/$libdir/dri. Currently we add $prefix to the user provided path. Resulting in an incorrect or even missing path. v2: fixed dri_search_path by default, rebased to master v3: new commit-message (Emil Velikov), cc mesa-stable Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109698 CC: Rafael Antognolli <rafael.antogno...@intel.com> CC: Dylan Baker <dy...@pnwbakers.com> Cc: 18.3 19.0 <mesa-sta...@lists.freedesktop.org> Fixes: 306914db92e1 (meson: Add dridriverdir variable to dri.pc.) Signed-off-by: Sergii Romantsov <sergii.romant...@globallogic.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit f6556ec7d126b31da37c08d7cb657250505e01a0) - - - - - e7351739 by Bas Nieuwenhuizen at 2019-02-25T21:26:36Z radv: Fix float16 interpolation set up. float16 types can have non-flat interpolation so set up the HW correctly for that. Fixes: 62024fa7750 "radv: enable VK_KHR_16bit_storage extension / 16bit storage features" Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> (cherry picked from commit a1fdd4a4a73604469b6204a56457b08f8ae4a948) Conflicts resolved by Dylan Conflicts: src/amd/vulkan/radv_nir_to_llvm.c - - - - - a03101c7 by Bas Nieuwenhuizen at 2019-02-25T21:26:36Z radv: Allow interpolation on non-float types. In particular structs containing floats and 16-bit floating point types. Fixes: 62024fa7750 "radv: enable VK_KHR_16bit_storage extension / 16bit storage features" Fixes: da295946361 "spirv: Only split blocks" Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109735 Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> (cherry picked from commit f3247841040a202faffe4709c07da9bd41693580) - - - - - 67162ad1 by Maya Rashish at 2019-02-25T21:26:36Z configure: fix test portability >From the bash manual: string1 == string2 string1 = string2 True if the strings are equal. = should be used with the test command for POSIX conformance. (cherry picked from commit 021c4961356c4b56b35d34b566e6f5f87d21fe34) - - - - - 5fcd81c5 by Jason Ekstrand at 2019-02-25T21:29:14Z compiler/types: Add a contains_64bit helper Reviewed-by: Alejandro Piñeiro <apinhe...@igalia.com> (cherry picked from commit 30b548fc6258e9a72722f511e377cf4716fd443c) - - - - - fdc25b9b by Jason Ekstrand at 2019-02-25T21:29:22Z nir/xfb: Properly align 64-bit values Fixes: 19064b8c "nir: Add a pass for gathering transform feedback info" Reviewed-by: Alejandro Piñeiro <apinhe...@igalia.com> (cherry picked from commit 8f0fe71cc5658728adc273daa03400aab7ec6d93) - - - - - 721011c6 by Jason Ekstrand at 2019-02-25T21:57:54Z nir: Rewrite lower_clip_cull_distance_arrays to do a lot less lowering Instead of going to all the work of to combine them into one array, just make two arrays and use location_frac to colocate them within CLIP0. Then the back-end can sort things out and stack them on top of each other. Thanks to ef99f4c8, we also don't need to set compact anymore. Reviewed-by: Alejandro Piñeiro <apinhe...@igalia.com> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> (cherry picked from commit 4e69fba534e7377f3bc6c40c73e6bc5c23437d4e) Conflicts resolved by Dylan Conflicts: src/compiler/nir/nir_lower_clip_cull_distance_arrays.c - - - - - 447ef1d9 by Jason Ekstrand at 2019-02-25T22:00:34Z nir/xfb: Work in terms of components rather than slots We needed to better handle cases where a chunk of a variable starts at some non-zero location_frac and rolls over into the next slot but may not be more than 4 dwords. For example, if gl_CullDistance is an array of 3 things and has location_frac = 2, it will span across two vec4s but is not, itself, bigger than a vec4. If you ignore the clip/cull special case, it's not allowed to happen for anything else because the only things that can span more than one slot is dvec3 and dvec4 and they're both bigger than a vec4. The current code uses this attrib_slot thing where we count attribute slots and iterate over them. However, that doesn't work in the case above because gl_CullDistance will have an attrib_slot count of 1 even though it does span two slots. We could fix this by adjusting attrib_slot but we already have comp_mask and it's easier to just handle it that way. Reviewed-by: Alejandro Piñeiro <apinhe...@igalia.com> (cherry picked from commit 558c3145045f1c6da8bddb31ed77a418ab27f2f9) - - - - - 7114cfc1 by Jason Ekstrand at 2019-02-25T22:00:40Z nir/xfb: Handle compact arrays in gather_xfb_info This makes us properly handle gl_ClipDistance and gl_CullDistance. Fixes: 19064b8c "nir: Add a pass for gathering transform feedback info" Reviewed-by: Alejandro Piñeiro <apinhe...@igalia.com> (cherry picked from commit 1a93fc382b18ee6d1135952d23f0b6a8aa8cd31f) - - - - - 49dad5e8 by Bas Nieuwenhuizen at 2019-02-25T22:01:31Z radv: Handle clip+cull distances more generally as compact arrays. Needed for https://gitlab.freedesktop.org/mesa/mesa/merge_requests/248 . That MR keeps the clip and cull arrays split. So we have to handle - compact arrays with location_frac != 0 - VARYING_SLOT_CLIP_DIST1 Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> (cherry picked from commit 1ef2855692d53349588fa3a9b425c9ae229e5e14) - - - - - c0509143 by Jason Ekstrand at 2019-02-25T22:17:48Z nir/lower_clip_cull: Fix an incorrect assert Copy+paste error. It was supposed to test cull and not clip. Fixes: 4e69fba534e "nir: Rewrite lower_clip_cull_distance_arrays..." Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109717 Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> (cherry picked from commit f98fd9d15a9a79ff1b41f1fce27bc285a20aa5bb) - - - - - bb3fdeda by Kenneth Graunke at 2019-02-26T15:50:07Z compiler: Mark clip/cull distance arrays as compact before lowering. nir_lower_clip_cull_distance_arrays() marks the combined clip/cull distance array as compact. However, when translating in from GLSL or SPIR-V, we were not marking the original float[] arrays as compact. We should do so. That way, we can detect these corner cases properly. Reviewed-by: Timothy Arceri <tarc...@itsqueeze.com> (cherry picked from commit ef99f4c8d176f4e854e12afa1545fa53f651d758) Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> - - - - - bdc946c2 by Bas Nieuwenhuizen at 2019-02-26T18:38:30Z radv: Fix rebase issue in 19.0 for float16 fix. The cherry-pick dropped a chunk. Fixes: e7351739ff2 "radv: Fix float16 interpolation set up." Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> - - - - - a4ea63e8 by Kenneth Graunke at 2019-02-26T18:40:21Z spirv: Eliminate dead input/output variables after translation. spirv_to_nir can generate input/output variables which are illegal for the current shader stage, which would cause nir_validate_shader to balk. After my recent commit to start decorating arrays as compact, dEQP-VK.spirv_assembly.instruction.graphics.module.same_module started hitting validation errors due to outputs in a TCS (not intended for the TCS at all) not being per-vertex arrays. Thanks to Jason Ekstrand for suggesting this approach. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109573 Fixes: ef99f4c8d17 compiler: Mark clip/cull distance arrays as compact before lowering. Reviewed-by: Juan A. Suarez <jasua...@igalia.com> (cherry picked from commit 6775665e5eec7db3f291508a8b7ba2a792f62ec0) - - - - - dd067d57 by Timothy Arceri at 2019-02-26T18:40:40Z radeonsi: fix query buffer allocation Fix the logic for buffer full check on alloc. This patch just takes the fix Nicolai attached to the bug report and updates it to work on master. Fixes: e0f0d3675d4 ("radeonsi: factor si_query_buffer logic out of si_query_hw") Reviewed-by: Marek Olšák <marek.ol...@amd.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109561 (cherry picked from commit 603206d0a61628deba3f0754324d4b7f382effe5) - - - - - 2cb6cdc2 by Tapani Pälli at 2019-02-26T18:40:48Z nir: initialize value in copy_prop_vars_block Fixes following valgrind warning: ==27561== Conditional jump or move depends on uninitialised value(s) ==27561== at 0x667856B: value_set_ssa_components (nir_opt_copy_prop_vars.c:78) ==27561== by 0x667A1C4: copy_prop_vars_block (nir_opt_copy_prop_vars.c:797) Fixes: 62332d139c8 "nir: Add a local variable-based copy propagation pass" Signed-off-by: Tapani Pälli <tapani.pa...@intel.com> Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.olive...@intel.com> (cherry picked from commit 22267feff1a35c4b6f1f0cb9c8e371727f99b5d6) - - - - - b2b148eb by Samuel Pitoiset at 2019-02-26T18:40:58Z radv: fix out-of-bounds access when copying descriptors BO list We shouldn't increment the buffer list pointers twice. This fixes some crashes with new CTS dEQP-VK.binding_model.descriptor_copy.*. Cc: 18.3 19.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 9256e0a09dfa94fecfef8e250755732ac35689ec) - - - - - e32fb87f by Samuel Pitoiset at 2019-02-26T18:41:09Z radv: don't copy buffer descriptors list for samplers Sampler descriptors don't have a buffer list. This fixes some crashes with new CTS dEQP-VK.binding_model.descriptor_copy.*.sampler_*. Cc: 18.3 19.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 4924dfc851e52c383380ae56be4d8606684ead7c) - - - - - df01e77d by Emil Velikov at 2019-02-26T18:41:18Z meson: egl: correctly manage loader/xmlconfig Earlier commit introduced support for haiku yet did not properly annotate the loader/xmlconfig dependencies. Thus we ended up adding inc_loader for each !haiku platform - see 659910eda01 9a96bf0ecd0 c731508b988 ec6cb01e216. One piece remained though - the wayland platform. Hence the following would fail: meson -Dgallium-drivers=etnaviv -Ddri-drivers=''\ -Dtools=etnaviv -Dplatforms=wayland -Dglx=disabled \ build/ Cc: Alexander von Gluck IV <kallis...@unixzen.com> Reported-by: Boris Brezillon <boris.brezil...@collabora.com> Fixes: 834d221512f ("meson: Add Haiku platform support v4") Signed-off-by: Emil Velikov <emil.veli...@collabora.com> Tested-by: Boris Brezillon <boris.brezil...@collabora.com> Reviewed-by: Eric Engestrom <eric.engest...@intel.com> Reviewed-by: Dylan Baker <dy...@pnwbakers.com> (cherry picked from commit f0a7b463b5586972f4b7f5d9d84eb0564087ce3f) - - - - - 0cf3c5f2 by Eleni Maria Stea at 2019-02-26T18:41:27Z i965: fixed clamping in set_scissor_bits when the y is flipped Calculating the scissor rectangle fields with the y flipped (0 on top) can generate negative values that will cause assertion failure later on as the scissor fields are all unsigned. We must clamp the bbox values again to make sure they don't exceed the fb_height. Also fixed a calculation error. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108999 https://bugs.freedesktop.org/show_bug.cgi?id=109594 v2: - I initially clamped the values inside the if (Y is flipped) case and I made a mistake in the calculation: the clamp of the bbox[2] should be a check if (bbox[2] >= fbheight) bbox[2] = fbheight - 1 instead and I shouldn't have changed the ScissorRectangleYMax calculation. As the fixed code is equivalent with using CLAMP instead of MAX2 at the top of the function when bbox[2] and bbox[3] are calculated, and the 2nd is more clear, I replaced it. (Nanley Chery) v3: - Reversed the CLAMP change in bbox[3] as the API guarantees that the viewport height is positive. (Nanley Chery) v4: - Added nomination for the mesa-stable branch and the link to the second bugzilla bug (Nanley Chery) CC: <mesa-sta...@lists.freedesktop.org> Tested-by: Paul Chelombitko <qamonste...@gmail.com> Reviewed-by: Nanley Chery <nanley.g.ch...@intel.com> (cherry picked from commit fd37a19ac4c8b2ebff330b2a06a7f311f7d478e3) - - - - - efe69eb1 by Samuel Pitoiset at 2019-02-26T19:43:10Z radv: fix clearing attachments in secondary command buffers If no framebuffer is bound, get the number of samples and the image format from the render pass. This fixes new CTS dEQP-VK.geometry.layered.*.secondary_cmd_buffer. Cc: 18.3 19.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 5671f38085216caf2cbf221a9fcda08b7571a762) Conflicts resolved by Dylan Conflicts: src/amd/vulkan/radv_meta_clear.c - - - - - 3e72463c by Dylan Baker at 2019-02-27T00:35:55Z Bump version for rc6 - - - - - b0ba44cf by Sergii Romantsov at 2019-02-28T10:40:43Z dri: meson: do not prefix user provided dri-drivers-path The user can select the location where there dri drivers are installed by the dri-drivers-path meson option. By default path will be $prefix/$libdir/dri. Currently we add $prefix to the user provided path. Resulting in an incorrect or even missing path. v2: fixed dri_search_path by default, rebased to master v3: new commit-message (Emil Velikov), cc mesa-stable Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109698 CC: Rafael Antognolli <rafael.antogno...@intel.com> CC: Dylan Baker <dy...@pnwbakers.com> Cc: 18.3 19.0 <mesa-sta...@lists.freedesktop.org> Fixes: 306914db92e1 (meson: Add dridriverdir variable to dri.pc.) Signed-off-by: Sergii Romantsov <sergii.romant...@globallogic.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit f6556ec7d126b31da37c08d7cb657250505e01a0) - - - - - 9df431b6 by Andreas Boll at 2019-02-28T10:46:08Z Document the cherry-pick in debian/changelog - - - - - b2d3fbd4 by Andreas Boll at 2019-03-02T11:40:52Z rules: Add meson option -Db_ndebug=true to disable assertions (Related bugs: #920462, #922162, #922346). - - - - - 673a2c74 by Andreas Boll at 2019-03-02T12:11:49Z Upload to unstable. - - - - - cdeb785f by Andreas Boll at 2019-03-02T12:21:49Z source/local-options: Remove meson build files from extend-diff-ignore. - - - - - 08249ea2 by Andreas Boll at 2019-03-02T12:22:32Z Really upload to unstable. - - - - - daea2fc6 by Timo Aaltonen at 2019-03-03T18:01:31Z Merge branch 'upstream-experimental' into debian-experimental - - - - - 0e56778f by Timo Aaltonen at 2019-03-03T18:02:40Z bump the version and close a bug on launchpad - - - - - aa2df0a2 by Timo Aaltonen at 2019-03-03T18:03:01Z Merge branch 'debian-unstable' into debian-experimental - - - - - ecf66008 by Timo Aaltonen at 2019-03-04T07:26:26Z release to experimental - - - - - 30 changed files: - VERSION - configure.ac - debian/changelog - debian/rules - debian/source/local-options - include/pci_ids/i965_pci_ids.h - meson.build - src/amd/common/ac_llvm_build.c - src/amd/common/ac_llvm_build.h - src/amd/common/ac_nir_to_llvm.c - src/amd/vulkan/radv_descriptor_set.c - src/amd/vulkan/radv_device.c - src/amd/vulkan/radv_formats.c - src/amd/vulkan/radv_meta_clear.c - src/amd/vulkan/radv_nir_to_llvm.c - src/amd/vulkan/radv_pipeline.c - src/amd/vulkan/radv_private.h - src/amd/vulkan/radv_shader.h - src/amd/vulkan/radv_shader_info.c - src/compiler/glsl/glsl_to_nir.cpp - src/compiler/glsl_types.cpp - src/compiler/glsl_types.h - src/compiler/nir/nir_gather_xfb_info.c - src/compiler/nir/nir_lower_clip_cull_distance_arrays.c - src/compiler/nir/nir_opt_copy_prop_vars.c - src/compiler/nir_types.cpp - src/compiler/nir_types.h - src/compiler/spirv/spirv_to_nir.c - src/compiler/spirv/vtn_variables.c - src/egl/drivers/dri2/platform_wayland.c The diff was not included because it is too large. View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/compare/2bec6439227941bf667ad5cb9e5c489f3a5d318a...ecf6600821868b10ac2b1e1a8af7a2d70beb8e0d -- View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/compare/2bec6439227941bf667ad5cb9e5c489f3a5d318a...ecf6600821868b10ac2b1e1a8af7a2d70beb8e0d You're receiving this email because of your account on salsa.debian.org.
