Mesa (staging/18.3): 29 new commits

Thu Mar 14 19:44:10 UTC 2019

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=009ea9462c391bb2ecca0003b8de7d21c00b556f
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Fri Feb 15 18:02:52 2019 +0100

    radv: write the alpha channel of MRT0 when alpha coverage is enabled

    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109597
    Cc: 18.3 19.0 <mesa-stable at lists.freedesktop.org>
    Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
    Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
    (cherry picked from commit 0d8f09629377da9cf48ab4315574d69fdef5369d)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4f30487a80194b80af2670b4e7da751d383678d3
Author: Danylo Piliaiev <danylo.piliaiev at globallogic.com>
Date:   Wed Jan 2 15:55:08 2019 +0200

    glsl/linker: Fix unmatched TCS outputs being reduced to local variable

    Always match TCS outputs since they are shared by all invocations
    within the patch and should not be converted to local variables.

    This is one of the issues found in Downward.

    Signed-off-by: Danylo Piliaiev <danylo.piliaiev at globallogic.com>
    Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
    Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104297
    (cherry picked from commit 9f29d90327e343f5717a98ceb6df2cdbab5d0e0b)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a1c6be2ab64b3c9617e91444287ef913a8cc5609
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Mar 11 19:00:21 2019 -0700

    intel/fs: Fix opt_peephole_csel to not throw away saturates.

    We were not copying the saturate bit from the original instruction
    to the new replacement instruction.  This caused major misrendering
    in DiRT Rally on iris, where comparisons leading to discards failed
    due to the missing saturate, causing lots of extra garbage pixels to
    be drawn in text rendering, trees, and so on.

    This did not show up on i965 because st/nir performs a more aggressive
    version of nir_opt_peephole_select, yielding more b32csel operations.

    Fixes: 52c7df1643e i965/fs: Merge CMP and SEL into CSEL on Gen8+

    Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
    (cherry picked from commit 3570d15b6d88bdcd353b31ffe5460d04a88b7b6f)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=92ad8814ac350019f71a21db54e2b264b8a7766d
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Mon Mar 11 20:43:15 2019 -0500

    glsl/lower_vector_derefs: Don't use a temporary for TCS outputs

    Tessellation control shader outputs act as if they have memory backing
    them and you can have multiple writes to different components of the
    same vector in-flight at the same time.  When this happens, the load vec
    store pattern that gets used by ir_triop_vector_insert doesn't yield the
    correct results.  Instead, just emit a sequence of conditional
    assignments.

    Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
    Cc: mesa-stable at lists.freedesktop.org
    (cherry picked from commit bd17bdc56b34a08c421172df27fe07294c7a7024)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=612ddf210ff8fb4c7186c3951a344f6aa01b778c
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Mon Mar 11 21:01:34 2019 -0500

    glsl/list: Add a list variant of insert_after

    Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
    Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>

    (cherry picked from commit 20c4578c5539de909e94a6acc3ad680ab2ddeca6)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b6cf9b73482e23e0d528396dfa367a8fceb290f1
Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Wed Mar 13 17:47:20 2019 +0000

    cherry-ignore: add explicit 19.0 performance optimisations

      nir: lower IO to vector
      intel: make use of the optimisation

    They address a 10% regression in a synthetic benchmark. No real world
    use-cases seems to be affected.

    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=13b23099a36769c30b8bc4bbefec3b7b01350a65
Author: pal1000 <liviuprodea at yahoo.com>
Date:   Thu Mar 7 10:38:10 2019 +0200

    scons: Compatibility with Scons development version string

    This ensures Mesa3D build doesn't fail in this case as encountered when
    bisecting Scons source code while regression testing
    https://bugs.freedesktop.org/show_bug.cgi?id=109443
    and when testing 3.0.5.a.2

    Technical details:
    Scons version string has consistently been in this format:
    MajorVersion.MinorVersion.Patch[.alpha/beta.yyyymmdd]
    so these formulas should strip alpha/beta flags and return Scons version:

    - as string - `'.'.join(SCons.__version__.split('.')[:3])`
    - as tuple of integers - `tuple(map(int, SCons.__version__.split('.')[:3]))`

    - v2: Fixed Scons version retrieval formulas as string and tuple of integers.
    - v3: Fixed Scons version string format description.

    Cc: "19.0" <mesa-stable at lists.freedesktop.org>
    Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
    (cherry picked from commit 7f89fd17ed2b1bd0c0fe4ec946dcabed0f8c74d3)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=dea94622fb16f926cd7becf9066febaf1f6f64f3
Author: Jose Fonseca <jfonseca at vmware.com>
Date:   Thu Feb 28 09:53:28 2019 +0000

    scons: Workaround failures with MSVC when using SCons 3.0.[2-4].

    This change applies the workaround suggested by Bill Deegan on the
    affected SCons versions.

    It also adds a comment with the URL explaining why we were using
    customizing the decider and max_drift in the first place, as I had
    forgotten all about it.

    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109443
    Tested-by: liviuprodea at yahoo.com
    Reviewed-by: Roland Scheidegger <sroland at vmware.com>
    Reviewed-by: Brian Paul <brianp at vmware.com>
    (cherry picked from commit 838c0485e01f3d3403b430aa6df5b4a1f5262dc3)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ce57ea90d3129f00f89be0e9171630ea8eeb79f2
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Mon Mar 11 10:25:53 2019 +0100

    radv: fix pointSizeRange limits

    The values should match the ones that are emitted.

    This fixes new CTS dEQP-VK.rasterization.primitive_size.points.*.

    Fixes: f4e499ec791 ("radv: add initial non-conformant radv vulkan driver")
    Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
    Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
    (cherry picked from commit 6403171843824ec8e9484bb8a21a4a18bfb01193)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d88857823f0f18020f1005b3e8c8a3271ba71f53
Author: Juan A. Suarez Romero <jasuarez at igalia.com>
Date:   Mon Mar 11 18:33:54 2019 +0100

    anv: destroy descriptor sets when pool gets reset

    As stated in Vulkan spec:
       "Resetting a descriptor pool recycles all of the resources from all
        of the descriptor sets allocated from the descriptor pool back to
        the descriptor pool, and the descriptor sets are implicitly freed."

    This fixes dEQP-VK.api.descriptor_pool.*

    Fixes: 14f6275c92f1 "anv/descriptor_set: add reference counting for..."
    Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
    Tested-by: Clayton Craft <clayton.a.craft at intel.com>
    (cherry picked from commit 775aabdd01739c413da7b38e5acbde1094209bcf)

    Squashed with:

    anv: Fix destroying descriptor sets when pool gets reset

    pool->next and pool->free_list were reset before their usage in
    anv_descriptor_pool_free_set

    Fixes: 775aabdd "anv: destroy descriptor sets when pool gets reset"
    Signed-off-by: Danylo Piliaiev <danylo.piliaiev at globallogic.com>
    Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    (cherry picked from commit 9c80be956fff4d4786a9b77c6b9d3fec67ff2377)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=dfcae38dcc65de76a828c7a1e31b0789f5c7016b
Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Wed Mar 13 18:14:45 2019 +0000

    cherry-ignore: ignore glsl_types memory cleanup patch

    The commit was reverted shortly after it was applied on master

    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=81107c96e600277ac0db8216d99c2ec1b7699642
Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Mon Mar 4 14:22:36 2019 +0200

    anv: destroy descriptor sets when pool gets destroyed

    Patch maintains a list of sets in the pool and destroys possible
    remaining sets when pool is destroyed.

    As stated in Vulkan spec:
       "When a pool is destroyed, all descriptor sets allocated from
        the pool are implicitly freed and become invalid."

    This fixes memory leaks spotted with valgrind:

       ==19622== 96 bytes in 1 blocks are definitely lost in loss record 2 of 3
       ==19622==    at 0x483880B: malloc (vg_replace_malloc.c:309)
       ==19622==    by 0x495B67E: default_alloc_func (anv_device.c:547)
       ==19622==    by 0x4955E05: vk_alloc (vk_alloc.h:36)
       ==19622==    by 0x4956A8F: anv_multialloc_alloc (anv_private.h:538)
       ==19622==    by 0x4956A8F: anv_CreateDescriptorSetLayout (anv_descriptor_set.c:217)

    Fixes: 14f6275c92f1 ("anv/descriptor_set: add reference counting for descriptor set layouts")
    Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
    Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
    (cherry picked from commit 105002bd2d6173b24f6955c22340b5bc77e029fa)
    [Emil: move list_del() anv_descriptor_{pool_free_set,set_destroy} ]
    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>

    Conflicts:
    	src/intel/vulkan/anv_descriptor_set.c

    ---
    Mostly a gut feeling - Tapani do we need a list_addtail/list_del in
    anv_descriptor_set_create()?

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5429dd0098c21f0487420433025d30651c59830c
Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Wed Mar 13 15:37:45 2019 +0000

    cherry-ignore: add gitlab-ci fixup commit

    gitlab-ci: autotools needs to be told which llvm version to use

    Commit references invalid sha - the offender did not land in branch.

    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b638eb5db420fcc489abb652f147cf7390605325
Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Wed Feb 27 15:53:55 2019 -0800

    intel/fs: Fix extract_u8 of an odd byte from a 64-bit integer

    In the old code, we would generate the exact same instruction for
    extract_u8(some_u64, 0) and extract_u8(some_u64, 1).  The mask-a-word
    trick only works for even numbered bytes.

    This fixes the (new) piglit test
    tests/spec/arb_gpu_shader_int64/execution/fs-ushr-and-mask.shader_test.

    v2: Use a SHR instead of an AND.  This saves an instruction compared to
    using two moves.  Suggested by Jason.

    Fixes: 6ac2d169019 ("i965/fs: Fix extract_i8/u8 to a 64-bit destination")
    Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
    (cherry picked from commit 55e6454d5e9dae6f8f29992af83f99217446da38)
    [Emil: byte -> byte->u32[0] ]
    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8448ece46090c1b387640b244959f1d45b23a764
Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Wed Feb 27 15:52:18 2019 -0800

    intel/fs: nir_op_extract_i8 extracts a byte, not a word

    Fixes: 6ac2d169019 ("i965/fs: Fix extract_i8/u8 to a 64-bit destination")
    Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
    (cherry picked from commit 4aaf139ea4cc7c4703e1906e0074f87f76c8e4cc)
    [Emil: resolve trivial conflicts]
    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>

    Conflicts:
    	src/intel/compiler/brw_fs_nir.cpp

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4f7c54eccec76d80a496d019335415423b32a9ca
Author: Marek Olšák <marek.olsak at amd.com>
Date:   Fri Jan 11 18:06:59 2019 -0500

    radeonsi: compile clear and copy buffer compute shaders on demand

    same as all other shaders

    (cherry picked from commit c605738113fe91d04f799eae52cec28fafac3f2d)
    Bug: https://github.com/ValveSoftware/halflife/issues/2100

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=89f3547656d583c77df38ac5166791ac4d858e1c
Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Wed Mar 6 21:45:12 2019 +0000

    cherry-ignore: add 19.0 only anv/push buffer nominations

    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4b372644f35dd2f91fd46b029813be481ae6d3f0
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Sat Jan 12 10:32:13 2019 -0600

    spirv: Pull offset/stride from the pointer for OpArrayLength

    We can't pull it from the variable type because it might be an array of
    blocks and not just the one block.  While we're here, throw in some
    error checking.

    Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    Cc: mesa-stable at lists.freedesktop.org
    (cherry picked from commit f1dbc7e97d3dcb2104b9438d32cace9529575208)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=079c124bcbc9231ef2c5bd9b465f0241902412cd
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Mon Mar 4 14:25:08 2019 +0100

    radv: properly align the fence and EOP bug VA on GFX9

    If alignement is 0, offets returned by
    radv_cmd_buffer_upload_alloc() are always 0. These two
    virtual addresses were pointing at the same location.

    Cc: 18.3 19.0 <mesa-stable at lists.freedesktop.org>
    Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
    Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
    (cherry picked from commit c2a148692b4d728e481b60a503e21931f9cf43f0)
    [Emil: resolve trivial conflicts]
    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>

    Conflicts:
    	src/amd/vulkan/radv_cmd_buffer.c

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=238c8c042b838a0df3c00c1a9fcde4d182b3e901
Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Wed Feb 27 15:26:08 2019 +0000

    egl: fix libdrm-less builds

    This function was never used, and isn't properly guarded by HAVE_LIBDRM,
    breaking the build on systems that don't have libdrm.

    Let's just remove it.

    Fixes: 7552fcb7b9b98392e6a8 "egl: add base EGL_EXT_device_base implementation"
    Reported-by: Timo Aaltonen <tjaalton at debian.org>
    Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
    Acked-by: Emil Velikov <emil.velikov at collabora.com>
    (cherry picked from commit bcc4bfc8e80da5dc4c6ee44f791f2112dac208d1)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c590c067765cd1c37462f9d7e9793f94b7c60540
Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Wed Feb 20 09:18:39 2019 +0200

    anv: retain the is_array state in create_plane_tex_instr_implicit

    This does not seem to fix anything ATM but is the right thing todo.

    Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
    Fixes: f3e91e78a33775 ("anv: add nir lowering pass for ycbcr textures")
    Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    (cherry picked from commit 33bf3d510c98a22706eb25815f1214d2e1a0e868)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8d21a1f8143adf46cc65df9b620deab0dd9cfad2
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Wed Feb 27 00:12:01 2019 -0600

    spirv: OpImageQueryLod requires a sampler

    No idea how this fell through the cracks besides the fact that the
    sampler bound at 0 almost always works and the CTS isn't amazing.  In
    any case, this appears to have been broken for almost forever.

    Reviewed-by: Samuel Iglesias Gonsálvez <siglesias at igalia.com>
    Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    Cc: mesa-stable at lists.freedesktop.org
    (cherry picked from commit ca295ddbfb414a526d3bab7daf93fffbbc417c6e)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=85b165e99c11202d8731fa9216cee226bc20d04a
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Fri Mar 1 14:01:08 2019 -0600

    anv: Count surfaces for non-YCbCr images in GetDescriptorSetLayoutSupport

    We were accidentally not counting those surfaces

    Fixes: ddc4069122 "anv: Implement VK_KHR_maintenance3"
    Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
    Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    (cherry picked from commit 5049fbddb4687799a10eb585c8789afa0d080535)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd2554c85b7f0254d40fdbac905624bef8ec83bc
Author: Axel Davy <davyaxel0 at gmail.com>
Date:   Fri Feb 22 20:45:51 2019 +0100

    st/nine: Ignore multisample quality level if no ms

    Apparently instead of returning error when passing
    a quality level different than 0 for
    D3DMULTISAMPLE_NONE, we should pass.

    Fixes: https://github.com/iXit/Mesa-3D/issues/340

    Cc: mesa-stable at lists.freedesktop.org

    Signed-off-by: Axel Davy <davyaxel0 at gmail.com>
    (cherry picked from commit 1d363d440f261fbadc1db3c17acc514b7130d505)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b1ef1c7a8e13308bce634cd2f93fe270b5de10fb
Author: Axel Davy <davyaxel0 at gmail.com>
Date:   Wed Jan 2 22:13:12 2019 +0100

    st/nine: Ignore window size if error

    Check GetWindowInfo and ignore the computed sizes
    if there is an error.

    Fixes a regression caused by earlier commit when
    using old wine gallium nine patches.

    Should also address a crash at window destruction.

    Related issues:
     https://github.com/iXit/Mesa-3D/issues/331
     https://github.com/iXit/Mesa-3D/issues/332

    Cc: mesa-stable at lists.freedesktop.org
    Fixes: 2318ca68bbe ("st/nine: Handle window resize when a presentation buffer is used")
    Signed-off-by: Axel Davy <davyaxel0 at gmail.com>
    (cherry picked from commit 86666f051e0cae96f2596cac05e3c3f394744149)
    [Emil: resolve trivial conflicts]
    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>

    Conflicts:
    	src/gallium/state_trackers/nine/swapchain9.c

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a61b6345764974df861a4dd8df122ce7e64d780f
Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Sat Mar 2 23:38:27 2019 +0100

    android: anv: fix libexpat shared dependency

    Fixes undefined reference building errors for XML_* functions

    Signed-off-by: Mauro Rossi <issor.oruam at gmail.com>
    Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
    Cc: "19.0" <mesa-stable at lists.freedesktop.org>
    (cherry picked from commit ec0f465bc5f02c93aeb4193db8b5bd90a254b080)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9814e187008cc7aa152ab52a45b02b35d6af5396
Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Mon Mar 4 10:34:08 2019 +0100

    android: anv: fix generated files depedencies (v2)

    Fix anv_extrypoints.{c,h} and anv_extensions.{c,h} missing dependencies
    Rename the variable labels according to targets and python scripts
    Align the building rules as per Automake for simplification

    Fixes building errors during rebuils due to missing dependencies

    (v2) Fixed a missing $(VULKAN_API_XML) reference

    Fixes: 9a508b7 ("android: anv/extensions: fix generated sources build")
    Fixes: dd088d4bec7 ("anv/extensions: Generate a header file with extension tables")
    Signed-off-by: Mauro Rossi <issor.oruam at gmail.com>
    Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
    Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
    Cc: "19.0" <mesa-stable at lists.freedesktop.org>
    (cherry picked from commit 14e7e26a0991e7f9b1d20147f04a43bb4cc3f824)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7ea63096528e28192843321be5a1b640cadbd9ee
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Fri Feb 22 01:13:39 2019 -0500

    glsl: fix recording of variables for XFB in TCS shaders

    This is purely for conformance, since it's not actually possible to do
    XFB on TCS output varyings. However we do have to make sure we record
    the names correctly, and this removes an extra level of array-ness from
    the names in question.

    Fixes KHR-GL45.tessellation_shader.single.xfb_captures_data_from_correct_stage

    v2: Add comment to the new program_resource_visitor::process function.
        (Ilia Mirkin)

    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108457
    Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
    Cc: 19.0 <mesa-stable at lists.freedesktop.org>
    Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
    (cherry picked from commit 4eec3a2a3652317f8e0fa97e0730c297bde8241a)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0d0d6f43693014b4507ca07864d0bc6f027b43bb
Author: Jose Maria Casanova Crespo <jmcasanova at igalia.com>
Date:   Wed Nov 21 18:23:03 2018 +0100

    glsl: TCS outputs can not be transform feedback candidates on GLES

    Avoids regression on:

    KHR-GLES*.core.tessellation_shader.single.xfb_captures_data_from_correct_stage

    that is uncovered by the following patch.

    "glsl: fix recording of variables for XFB in TCS shaders"

    v2: Rebased over glsl: fix recording of variables for XFB in TCS shaders
    v3: Move this patch before "glsl: fix recording of variables for XFB in TCS
        shaders" to avoid temporal regressions. (Illia Mirkin)

    Cc: 19.0 <mesa-stable at lists.freedesktop.org>
    Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
    (cherry picked from commit bf1f49482d677e562993543cd9a9367597ce3ccc)