Mesa (19.1): 31 new commits

Fri Sep 13 15:02:51 UTC 2019

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2959de1f92018919c42f2c445fadfc4a01a699e7
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Thu Sep 12 15:58:25 2019 +0200

    radv: fix allocating number of user sgprs if streamout is used

    streamout_buffers is assigned after that function, so the previous
    fix was completely wrong. This probably fix something when streamout
    buffers and push constants are used/inlined in the same shader.

    Fixes: 378e2d24143 ("radv: fix computing number of user SGPRs for streamout buffers")
    Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
    Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
    (cherry picked from commit 8137df3a46abc6aa6ad0c7179d042e76ca2b2299)
    [Juan A. Suarez: fix the structure usage]
    Signed-off-by: Juan A. Suarez Romero <jasuarez at igalia.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=30689e7da86511d61cbcb0a3e8403a547115db99
Author: Danylo Piliaiev <danylo.piliaiev at globallogic.com>
Date:   Wed Sep 4 16:43:17 2019 +0300

    tgsi_to_nir: Translate TGSI_INTERPOLATE_COLOR as INTERP_MODE_NONE

    Translating TGSI_INTERPOLATE_COLOR as INTERP_MODE_SMOOTH made
    it for drivers impossible to have flatshaded color inputs.

    Translate it to INTERP_MODE_NONE which drivers interpret as
    smooth or flat depending on flatshading state.

    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111467

    Fixes: 770faf54 ("tgsi_to_nir: Improve interpolation modes.")

    Signed-off-by: Danylo Piliaiev <danylo.piliaiev at globallogic.com>
    Reviewed-by: Marek Olšák <marek.olsak at amd.com>
    Reviewed-by: Eric Anholt <eric at anholt.net>
    (cherry picked from commit 175c32e9bdc8b7b9c43f605cb59cd82415075f67)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9556c5b1a29cf0f1679cfd2166863a9092f32ec5
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Sep 9 07:23:22 2019 -0700

    gallium: Fix util_format_get_depth_only

    This is a pipe format, not a boolean.

    Fixes: 5849e0612cc ("gallium/auxiliary: Add util_format_get_depth_only() helper.")
    Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
    (cherry picked from commit c6d40b5182daf1361686215d31d3c0345e0992f2)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=83dadcfdc6f085999cdeab969fa33786042c5811
Author: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
Date:   Wed Aug 21 10:04:56 2019 -0700

    glsl/nir: Avoid overflow when setting max_uniform_location

    Don't use the UNMAPPED_UNIFORM_LOC (-1) to set the unsigned
    max_uniform_location.  Those unmapped uniforms don't have to be
    accounted at this point.

    Fixes: 7a9e5cdfbb9 ("nir/linker: Add gl_nir_link_uniforms()")
    Reviewed-by: Alejandro Piñeiro <apinheiro at igalia.com>
    (cherry picked from commit 4f33f96c4517f86f6f720f745cd49f8a0754393b)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1f7629a7605f2b167b74e7c0858b089557028059
Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Sun Sep 8 17:35:22 2019 +0200

    android: anv: libmesa_vulkan_common: add libmesa_util static dependency

    Change needed to fix the following building error:

    In file included from external/mesa/src/intel/vulkan/anv_device.c:43:
    external/mesa/src/util/xmlpool.h:115:10: fatal error: 'xmlpool/options.h' file not found
             ^~~~~~~~~~~~~~~~~~~
    1 error generated.

    Fixes: 4dcb1ff ("anv: add support for driconf")
    Signed-off-by: Mauro Rossi <issor.oruam at gmail.com>
    Reviewed-by: Eric Engestrom <eric at engestrom.ch>
    (cherry picked from commit ae5ac26dfa13de84c09f897c828cf621729ce622)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5b85ecce0b33e0cb14995c4018a4ec115cf70b26
Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Sun Sep 1 10:05:12 2019 +0200

    util: fix SSE-version needed for double opcodes

    This code generates CVTSD2SI, which requires SSE2. So let's fix the
    required SSE-version.

    Signed-off-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
    Fixes: 5de29ae (util: try to use SSE instructions with MSVC and 32-bit gcc)
    Reviewed-by: Matt Turner <mattst88 at gmail.com>
    (cherry picked from commit 2ade1c5cf790ab8df62e4ff9d67e360ac870ff1f)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c34a479cc37f895bb11619600c0aa252596e477c
Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Sun May 5 18:43:33 2019 +0200

    android: amd/common: fix missing include path

    Fixes the following building error in Android:

    In file included from external/mesa/src/amd/common/ac_llvm_helper.cpp:34:
    In file included from external/mesa/src/amd/common/ac_llvm_build.h:30:
    In file included from external/mesa/src/compiler/nir/nir.h:40:
    In file included from external/mesa/src/compiler/nir_types.h:36:
    external/mesa/src/compiler/glsl_types.h:37:10: fatal error: 'main/config.h' file not found
             ^~~~~~~~~~~~~~~
    1 error generated.

    Fixes: bd4c661 ("ac,ac/nir: use a better sync scope for shared atomics")
    Signed-off-by: Mauro Rossi <issor.oruam at gmail.com>
    Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
    (cherry picked from commit bbbbea243aea8297a4b7006be9e8f8e85c493b81)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=51fc954c90bb4c0013ca39a98952cee6f0d8d8d7
Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Wed Apr 24 15:11:02 2019 +0200

    android: radv: fix necessary dependecies

    Fixes building errors due to libmesa_util and libexpat dependencies:

    In file included from external/mesa/src/amd/vulkan/radv_device.c:52:
    external/mesa/src/util/xmlpool.h:115:10: fatal error: 'xmlpool/options.h' file not found
             ^~~~~~~~~~~~~~~~~~~
    1 error generated.

    FAILED: out/target/product/x86_64/obj_x86/SHARED_LIBRARIES/vulkan.radv_intermediates/LINKED/vulkan.radv.so
    ...
    external/mesa/src/util/xmlconfig.c:670: error: undefined reference to 'XML_ParserCreate'
    ...
    clang.real: error: linker command failed with exit code 1 (use -v to see invocation)

    Fixes: 3c2e826 ("radv: Add support for driconf.")
    Signed-off-by: Mauro Rossi <issor.oruam at gmail.com>
    Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
    (cherry picked from commit 51e24af8fdebeac58891378278af4351789a9e88)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b4fd0bae5c6faf8518e8b3f303284c8b7e8e820e
Author: Juan A. Suarez Romero <jasuarez at igalia.com>
Date:   Tue Sep 10 08:05:27 2019 +0000

    cherry-ignore: add explicit 19.2 only nominations

    Signed-off-by: Juan A. Suarez Romero <jasuarez at igalia.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=05beca4dcf1a7b654e641f32ef3329b29bad02cc
Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Fri Aug 30 11:35:26 2019 -0500

    nir/dead_cf: Repair SSA if the pass makes progress

    The dead_cf pass calls into the CF manipulation helpers which attempt to
    keep NIR's SSA form sane.  However, when the only break is removed from
    a loop, dominance gets messed up anyway because the CF SSA clean-up code
    only looks at phis and doesn't consider the case of code becoming
    unreachable.  One solution to this would be to put the loop into LCSSA
    form before we modify any of its contents.  Another (and the approach
    taken by this pass) is to just run the repair_ssa pass afterwards
    because the CF manipulation helpers are smart enough to keep all the
    use/def stuff sane; they just don't always preserve dominance
    properties.

    While we're here, we clean up some bogus indentation.

    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111405
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111069
    Cc: mesa-stable at lists.freedesktop.org
    Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
    (cherry picked from commit c832820ce959ae7c2b4971befceae634d800330f)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d77aa3cc1c356e920136d85d73664fe4442bd0aa
Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Fri Aug 30 14:16:07 2019 -0500

    nir/repair_ssa: Insert deref casts when needed

    Cc: mesa-stable at lists.freedesktop.org
    Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
    (cherry picked from commit 1005272a2b7c744b6ac4d846566359a8ff1b6295)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ff8122d5a2b5e8a7b2225be4a60a61fb55cbb9e3
Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Mon Sep 2 12:54:31 2019 -0500

    nir/repair_ssa: Repair dominance for unreachable blocks

    NIR currently assumes that unreachable blocks are trivially dominated by
    everything.  However, when considering well-formed SSA, there is no path
    from any block to an unreachable block.  Therefore, we can break any
    use-def chains where the use is in an unreachable block.  This removes
    any dependencies on code created by uses in unreachable blocks and lets
    DCE do a better job of cleaning it up.

    Cc: mesa-stable at lists.freedesktop.org
    Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
    (cherry picked from commit a3268599f3c9bb1d92571e15df95750a06114811)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=18005d8fd35550c5782a73b8a020e7d771fb9fab
Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Mon Sep 2 12:53:16 2019 -0500

    nir: Add a block_is_unreachable helper

    Cc: mesa-stable at lists.freedesktop.org
    Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
    (cherry picked from commit f81a2623d82ccad6177fe1fe5b80a6398df29b6e)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=01d452de585560868359729ca459437298789485
Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Fri Aug 30 13:55:02 2019 -0500

    nir: Don't infinitely recurse in lower_ssa_defs_to_regs_block

    Cc: mesa-stable at lists.freedesktop.org
    Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
    (cherry picked from commit 517142252f0c63189293c7176efbf490b7ae95ea)
    [Juan A. Suarez: resolve trivial conflicts]
    Signed-off-by: Juan A. Suarez Romero <jasuarez at igalia.com>

    Conflicts:
    	src/compiler/nir/nir_from_ssa.c

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=431f5a8a7804ad9c2c6323e146ef47525ee0d959
Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Thu Aug 29 23:52:52 2019 +0100

    radv: add support for vk_x11_override_min_image_count

    Cc: mesa-stable at lists.freedesktop.org
    Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
    Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
    Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    (cherry picked from commit 5eb7d48b5840f33e759ba0da36134883f2a44d9f)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=89d1ca343fd6effcfb2500b48540f72848ae7799
Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Fri Aug 30 17:03:12 2019 +0100

    amd: move adaptive sync to performance section, as it is defined in xmlpool

    Fixes: 3844ed8d44677588bc29 ("radv: Add adaptive_sync driconfig option and enable it by default.")
    Fixes: e260493f2ab2483e5a55 ("radeonsi: Enable adaptive_sync by default for radeon")
    Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
    Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
    Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    (cherry picked from commit 4ad99ee9616f86eff96f4840354c64a60e341a6b)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a150bb7e03667fa2ac964914cd0f915d4381517e
Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Thu Aug 29 23:55:29 2019 +0100

    anv: add support for vk_x11_override_min_image_count

    Cc: mesa-stable at lists.freedesktop.org
    Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
    Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
    Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    (cherry picked from commit 037b5b567f75db2dd264b23a93abbc88305c7551)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4d5bcb4c33d4b018c3a71aee553908e6d1406871
Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Thu Aug 29 23:49:29 2019 +0100

    wsi: add minImageCount override

    Cc: mesa-stable at lists.freedesktop.org
    Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
    Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl> (v1)
    Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    (cherry picked from commit a72cdd00abd5f3c18df01acc60bf3b385facfdb6)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2977a3e0e1a5f0950001e12402c9936e5d38ab9e
Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Wed Apr 24 16:42:25 2019 +0100

    anv: add support for driconf

    No option is supported yet, this is just the boilerplate.

    Cc: mesa-stable at lists.freedesktop.org
    Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
    Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
    Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    (cherry picked from commit 4dcb1fff19383ae451f3228e55d3fc987a7ab46d)
    [Juan A. Suarez: resolve trivial conflicts]
    Signed-off-by: Juan A. Suarez Romero <jasuarez at igalia.com>

    Conflicts:
    	src/intel/vulkan/meson.build

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=82edaa5a418656a5de840b4894f0006d59b6b9a5
Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Tue Sep 3 10:00:23 2019 -0500

    anv: Bump maxComputeWorkgroupSize

    Fixes: 9a129510f56f "anv: Bump maxComputeWorkgroupInvocations"
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111552
    Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    (cherry picked from commit 3b1a7e5333335900293935399ce49a67562eafc7)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=667920050a7f3941a83c51863501b58abbbde4f5
Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Sun Sep 1 22:12:07 2019 -0500

    Revert "intel/fs: Move the scalar-region conversion to the generator."

    This reverts commit c0504569eac5e5c305e9f0c240e248aca9d8891f.  Now that
    we're doing interpolation lowering in NIR, we can continue to stride the
    FS input registers directly in the brw_fs_nir code like we did before.
    This fixes SIMD32 fragment shaders which broke because lower_simd_width
    depended on the 0 stride to split PLN instructions correctly.

    Reviewed-by: Francisco Jerez <currojerez at riseup.net>
    (cherry picked from commit d15fe8ca8262d502435c4f83985ac414f950bc5f)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=48f78dfce28f6a9d2449302ce5d29ecd36feee48
Author: Sergii Romantsov <sergii.romantsov at globallogic.com>
Date:   Wed Jun 5 14:33:58 2019 +0300

    intel/dri: finish proper glthread

    KWin was able to get NULL-context in the call
    intelUnbindContext. But a call _mesa_glthread_finish
    is not resistent to such case.
    Case can be catched with steps:
    	1. Create both glx and egl contexts
    	2. Make glx as current
    	3. Make egl as current
    	4. Reset glx context
    	5. Make egl as current

    Solution adds proper finishing of glthread-context
    (context will be taken from the requested dri-context
    for unbinding, but not from the saved current context).

    Piglit-test: https://gitlab.freedesktop.org/mesa/piglit/merge_requests/87

    Cc: 19.1 19.2 <mesa-stable at lists.freedesktop.org>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110814
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111271
    Fixes: dca36d5516d0 (i965: Implement threaded GL support)
    Signed-off-by: Sergii Romantsov <sergii.romantsov at globallogic.com>
    Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
    (cherry picked from commit 1dce75c1839f08cfa78400367019f998c258eff5)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d74ccd46fa0549ee73d995557588d90ff2044d9c
Author: Connor Abbott <cwabbott0 at gmail.com>
Date:   Thu Sep 5 13:57:11 2019 +0200

    radv: Call nir_propagate_invariant()

    Without this, invariant qualifiers don't do anything. Together with a
    fix to the game, this fixes flickering in No Man's Sky.

    Cc: mesa-stable at lists.freedesktop.org
    Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
    (cherry picked from commit 3f5b541fc8b2aae6e71783b7a9bb8eb2ffa3a74d)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=35d435235a02584449922ccbede5bcc81d81f5a2
Author: Hal Gentz <zegentzy at protonmail.com>
Date:   Thu Jul 25 15:40:50 2019 -0600

    glx: Fix SEGV due to dereferencing a NULL ptr from XCB-GLX.

    When run in optirun, applications that linked to `libGLX.so` and then
    proceeded to querying Mesa for extension strings caused a SEGV in Mesa.

    `glXQueryExtensionsString` was calling a chain of functions that
    eventually led to `__glXQueryServerString`. This function would call
    `xcb_glx_query_server_string` then `xcb_glx_query_server_string_reply`.
    The latter for some unknown reason returned `NULL`. Passing this `NULL`
    to `xcb_glx_query_server_string_string_length` would cause a SEGV as the
    function tried to dereference it.

    The reason behind the function returning `NULL` is yet to be determined,
    however, simply checking that the ptr is not `NULL` resolves this. A
    similar check has been added to `__glXGetString` for completeness sake,
    although not immediately necessary.

    In addition to that, we stumbled into a similar problem in
    `AllocAndFetchScreenConfigs` which tries to access the configs to free
    them if `__glXQueryServerString` fails. This, of course, SEGVs, because the
    configs are yet to have been allocated. Simply continuing past the configs
    if their config ptrs are `NULL` resolves this. We also switch to `calloc`
    to make sure that the config ptrs are `NULL` by default, and not some
    uninitialized value.

    Cc: mesa-stable at lists.freedesktop.org
    Fixes: 24b8a8cfe821 "glx: implement __glXGetString, hide __glXGetStringFromServer"
    Fixes: cb3610e37c4c "Import the GLX client side library, formerly from xc/lib/GL/glx. Build it "
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Hal Gentz <zegentzy at protonmail.com>
    (cherry picked from commit 1591d1fee5016a21477edec0d2eb6b2d24221952)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=29159cbf2149cd9f96c385df4de0cde9e83a0215
Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Mon Aug 26 15:33:31 2019 +0100

    nir: fix memleak in error path

    Fixes: 2cf59861a8128a91bfdd ("nir: Add partial redundancy elimination for compares")
    Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
    Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
    Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
    (cherry picked from commit 7659c6197f08587f57f101a88a7e477337ce363c)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6a5c36715aecd1fdc84c2e85e531cb6924793d36
Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Mon Aug 26 15:32:36 2019 +0100

    anv: fix format string in error message

    Fixes: 9775894f102535a79186 ("anv: Move size check from anv_bo_cache_import() to caller (v2)")
    Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
    Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    (cherry picked from commit 7abf65aedc679069b794fddfa6feafa68d36d06a)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3bd87314e21c3a07e9b143666a9fd492f94feced
Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Mon Aug 26 15:30:54 2019 +0100

    util/os_file: fix double-close()

    Fixes: 955c63d3643f30d7db0c ("util/os_file: resize buffer to what was actually needed")
    Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
    Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
    (cherry picked from commit 1667360f7d920a35191dc67b7ee120eef95e8788)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5fcb149a461c3025d643df7aa0713b1d64ab0a6f
Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Mon Aug 26 15:29:49 2019 +0100

    egl: fix deadlock in malloc error path

    Fixes: cb0980e69aa921af7086 ("egl: move alloc & init out of _eglBuiltInDriver{DRI2,Haiku}")
    Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
    Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
    (cherry picked from commit 43d470404c47d86d1fab93d1345e09375bcf4fb6)
    Signed-off-by: Juan A. Suarez Romero <jasuarez at igalia.com>
    [Juan A. Suarez: resolve trivial conflicts]

    Conflicts:
    	src/egl/main/egldriver.c

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=524373ba9942ccd60c7f4ac3f050ca4dd61ff036
Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Mon Aug 26 15:52:33 2019 +0100

    ttn: fix 64-bit shift on 32-bit `1`

    Fixes: 4d0b2c7aaac3cf3de5af ("ttn: Update shader->info as we generate code.")
    Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
    Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
    Reviewed-by: Eric Anholt <eric at anholt.net>
    Reviewed-by: Rob Clark <robdclark at gmail.com>
    (cherry picked from commit 3afe9d798aacc0abc6d898dda3360f06517caf8e)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4115781efa1f751216e1b0305380b41bba350b29
Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Wed Aug 21 13:47:25 2019 +0200

    vulkan/overlay: bounce image back to present layout

    Once we write the overlay to an image to be presented, we must not
    forget to put it back into present layout.

    Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111401
    Cc: <mesa-stable at lists.freedesktop.org>
    Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
    (cherry picked from commit 320b0f66c27407008784da3606e23cb44c70ddf0)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d16ab58f50ccc985fe759eb37480800e5bddca58
Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Wed Jul 17 10:21:08 2019 +0200

    gallium/auxiliary/indices: consistently apply start only to input

    The majority of these only apply the start argument to the input, but a
    few of them also does for the output-array. util_primconvert, the only
    user of this argument expects this pass a non-zero start-argument does
    not expect this to be applied to the output; if it is, it will write
    outside of allocated memory, leading to VRAM corruption.

    The reason this doesn't seem to have been noticed before, is that no
    driver currently use util_primconvert to convert a primitive-type to
    itself, which is the cases where this was broken. But for Zink, this
    will no longer be true, because we need to eliminate the use of 8-bit
    index-buffers.

    Signed-off-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
    Fixes: 28f3f8d413f ("gallium/auxiliary/indices: add start param")
    Reviewed-by: Rob Clark <robdclark at chromium.org>
    (cherry picked from commit 52af1427c6d248829130ce25b86cd27a31d34633)