Mesa (18.2): 40 new commits

Tue Dec 25 17:21:34 UTC 2018

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3f04c31cfec2813ac3ea3f3bb1204c60dbd9390c
Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Wed Dec 12 19:24:14 2018 +0000

    glx/test: meson: assorted include fixes

    Swap '..' with the symbolic inc_glx and add glproto as dependency. That
    will pull the correct include, effectively fixing the tests on macOS.

    Fixes: a47c525f328 ("meson: build glx")
    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
    Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
    (cherry picked from commit f331419f262d3a0f270376cafbb9517b4627bb7a)
    [Juan A. Suarez: resolve trivial conflicts]
    Signed-off-by: Juan A. Suarez Romero <jasuarez at igalia.com>

    Conflicts:
    	src/glx/tests/meson.build

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3de8d15d1fb9f6e85441505d1651701ecbb8c608
Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Wed Dec 12 19:07:52 2018 +0000

    glx: meson: wire up the dispatch-index-check test

    Accidentally dropped with earlier commit.!

    Fixes: 4ccb9816737 ("meson: Use consistent style for tests")
    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
    Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
    (cherry picked from commit e139d7a8a315502d538b6a753cb42e841c10e57f)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7f1cc8d52d9325bf49aa70c5ca289a64913e6194
Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Wed Dec 12 17:55:08 2018 +0000

    glx: meson: drop includes from a link-only library

    When producing the final libGL.so/libGLX_mesa.so we only link the local
    static helper lib (libglx). Thus there's no reason for the includes.

    Fixes: a47c525f328 ("meson: build glx")
    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
    Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
    (cherry picked from commit b44875e2dc650c58986480f3360fccfc8d890605)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0d692a5b54bef1cee1665f0cc94d72ffb8243cd4
Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Wed Dec 12 17:47:36 2018 +0000

    TODO: glx: meson: build dri based glx tests, only with -Dglx=dri

    The library itself (libGL) is only built when -Dglx=dri, yet it's
    accompanying tests are build even with -Dglx=xlib.

    Adjust the guards, so we don't build the tests when they are not
    applicable

    v2:
     - Reword commit message (Dylan)
     - Drop build_by_default hunk (Dylan)

    Fixes: a47c525f328 ("meson: build glx")
    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
    Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
    (cherry picked from commit 9527f9ea2611b0793377016c8c16ec58ded7f287)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=00fda84bff46508bebd14185e82bd4276783ccb7
Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Thu Dec 13 04:10:50 2018 +0000

    pipe-loader: meson: reference correct library

    The library is called libgalliumvl_stub - note singular.

    Fixes: 42ea0631f10 ("meson: build clover")
    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
    Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
    (cherry picked from commit 2eedb79e1a2e92648bd245f9db88ecb7b587b7fd)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1af31b1bac7e6f6ffc6f4e8c1d12f8bc89ef0a1f
Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Thu Dec 13 03:54:03 2018 +0000

    meson: don't require glx/egl/gbm with gallium drivers

    The gallium drivers do not require a DRI loader. Drop the artificial
    and unnecessary restriction.

    Fixes: af9d276134d ("meson: build libmesa_gallium")
    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
    Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
    (cherry picked from commit 9d10581897ef7cfa0f6c392e2048cc04357281b9)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f0249666266575f69ab47ce6d6da1ebd28ea93e3
Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Mon Dec 3 18:40:10 2018 +0000

    anv: don't do partial resolve on layer > 0

    We've made the choice not to use fast clears on layer > 0 with
    multilayer images. This is partly because we would need to store
    multiple clear colors for each layer, making the existing memory
    layout, already including aux surfaces, fast clear color, image state,
    etc... even more complex.

    Partial resolves are the operations transfering the clear colors into
    the auxiliary buffers. This operation is currently implemented in
    Blorp by loading the clear color from the image's BO, into a shader
    that then samples from the auxiliary buffer and writes the color only
    if it isn't there already.

    The problem here is that because we store only one clear color for all
    layers and it is used for partial resolves. If you trigger a partial
    clear on a layer > 0, then you're likely to deal with a color that is
    not what you actually want. In the particular issues below, we have
    multiple layers, each cleared with a different color but the partial
    resolve just writes the wrong color into the auxiliary buffers for
    layers > 0.

    Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108910
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108911
    Cc: mesa-stable at lists.freedesktop.org
    (cherry picked from commit e2ae5f2f0a0dbdae08e026b88e30552728c4abd6)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2d60f11197d856193f56b590f1876ba390809084
Author: Axel Davy <davyaxel0 at gmail.com>
Date:   Mon Dec 3 21:24:54 2018 +0100

    st/nine: Add src reference to nine_context_range_upload

    Just like nine_context_box_upload, nine_context_range_upload
    should reference the src, which holds the ram source buffer.

    Fixes: https://github.com/iXit/Mesa-3D/issues/327
    Signed-off-by: Axel Davy <davyaxel0 at gmail.com>
    Tested-by: Dieter Nützel <Dieter at nuetzel-hh.de>
    Cc: mesa-stable at lists.freedesktop.org
    (cherry picked from commit 104681c5d528a823a3fdc3f7d9c6f8133c27201c)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec1bae22365f9adb27bbca97069d7b4501c909c9
Author: Axel Davy <davyaxel0 at gmail.com>
Date:   Mon Dec 3 21:15:47 2018 +0100

    st/nine: Bind src not dst in nine_context_box_upload

    nine_context_box_upload uploads a ram buffer (from src)
    to a pipe_resource (dst).
    We already have a refcount on the pipe_resource,
    what needs to be protected from release is the ram buffer,
    thus a reference to src.

    Signed-off-by: Axel Davy <davyaxel0 at gmail.com>
    Tested-by: Dieter Nützel <Dieter at nuetzel-hh.de>
    Cc: mesa-stable at lists.freedesktop.org
    (cherry picked from commit 42d672fa6a766363e5703f119607f7c7975918aa)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8689dcba7b6988c4973177861cb2eb9b1b6913e2
Author: Axel Davy <davyaxel0 at gmail.com>
Date:   Sun Nov 25 14:37:53 2018 +0100

    st/nine: Fix volumetexture dtor on ctor failure

    The dtor is called on allocation failure,
    thus we must check the volumes are allocated
    before trying to release them.

    Signed-off-by: Axel Davy <davyaxel0 at gmail.com>
    Tested-by: Dieter Nützel <Dieter at nuetzel-hh.de>
    Cc: mesa-stable at lists.freedesktop.org
    (cherry picked from commit f91f748fabd7fec8f571124df23296c07102a983)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=14e04a2011c2ed6df2b1f006487d81f9ff31cfcf
Author: Alex Deucher <alexander.deucher at amd.com>
Date:   Thu Dec 20 10:11:01 2018 -0500

    pci_ids: add new VegaM pci id

    Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
    Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
    Cc: mesa-stable at lists.freedesktop.org
    (cherry picked from commit 516160d717b81141a65a03060ac440a1cad8ae94)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ced1bf714b0fc6cdc59883d970a5d70899025e91
Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Mon Dec 17 16:25:40 2018 +0000

    bin/get-pick-list.sh: warn when commit lists invalid sha

    We had cases where people would list old/invalid sha in the commit.
    Add a trivial checker to catch those and throw a warning.

    CC: Juan A. Suarez <jasuarez at igalia.com>
    CC: Dylan Baker <dylan at pnwbakers.com>
    CC: mesa-stable at lists.freedesktop.org
    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
    Reviewed-by: Andres Gomez <agomez at igalia.com>
    (cherry picked from commit e0dbfc995370756355f28ac31495eab96a410384)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1eb1a23237b1dfb9fd514a511881ac085318aa1c
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Mon Dec 17 15:44:25 2018 +0000

    bin/get-pick-list.sh: rework handing of sha nominations

    Currently our is_sha_nomination does:
     - folds any whitespace, attempting to extract sha-like information
     - checks that at least one of the shas has landed

    Split it in two and do sha-like validation first.

    This way, commits with mesa-stable and sha nominations will feature the
    fixes/revert/etc instead of stable (a) or will be omitted if not
    applicable for the respective branch (b).

    Misc examples from 18.3

    (a)
    -[   stable ] 5bc509363b6 glx: make xf86vidmode mandatory for direct rendering
    +[    fixes ] 5bc509363b6 glx: make xf86vidmode mandatory for direct rendering

    (b)
    -[   stable ] 9a7b3199037 anv/query: flush render target before copying results

    CC: Juan A. Suarez <jasuarez at igalia.com>
    CC: Dylan Baker <dylan at pnwbakers.com>
    CC: mesa-stable at lists.freedesktop.org
    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
    Reviewed-by: Andres Gomez <agomez at igalia.com>
    (cherry picked from commit 6b296f64af5d69a1d0e4cdcda5f8c6d090dd4449)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4203d05c11000cabc6682b74eb5d2c172f62391f
Author: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
Date:   Fri Dec 14 22:19:24 2018 -0800

    nir: properly clear the entry sources in copy_prop_vars

    When updating a copy entry source value from a "non-SSA" (the data
    come from a copy instruction) to a "SSA" (the data or parts of it come
    from SSA values), it was possible to hold invalid data in ssa[0]
    depending on the writemask.  Because the union, ssa[0] could contain a
    pointer to a nir_deref_instr left-over from previous non-SSA usage.

    Change code to clean up the array before use to avoid invalid data
    around.

    Fixes: 62332d139c8 "nir: Add a local variable-based copy propagation pass"
    Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
    (cherry picked from commit 0ddc911f4d83a3c698ea02696e1b8706b2cce381)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a1b25102c17b90323eee2740be11fd449e64d761
Author: Juan A. Suarez Romero <jasuarez at igalia.com>
Date:   Thu Dec 20 16:40:08 2018 +0100

    cherry-ignore: intel/compiler: move nir_lower_bool_to_int32 before nir_lower_locals_to_regs

    pick: This commit is nominated to stable, but fixes commit 11dc1307794
    which is not in the current stable branch.

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

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8a5e70c5fb4a9301df1ce9ced126aca3941f8db7
Author: Juan A. Suarez Romero <jasuarez at igalia.com>
Date:   Thu Dec 20 16:28:45 2018 +0100

    cherry-ignore: nir: properly find the entry to keep in copy_prop_vars

    pick: This commit is nominated to stable, but fixes commit b3c61469255
    which is in 18.3 stable. Hence, this commit is considered as nominated
    to 18.3 stable.

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

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d06b8a322a1e7868d885624bb8ff7528a5029b28
Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Mon Dec 17 10:42:13 2018 +0100

    ac: split 16-bit ssbo loads that may not be dword aligned

    This ends up refactoring visit_load_buffer() a little.

    Fixes: 7e7ee826982 ('ac: add support for 16bit buffer loads')
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108114
    Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
    Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4ff2105e1d988cc20ce3546005ac8f529e2d85ad
Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Mon Dec 17 18:48:17 2018 -0800

    Revert "nir/lower_indirect: Bail early if modes == 0"

        "There's no point in walking the program if we're never going to
        actually lower anything."

    Except we might lower compacted local arrays.  In that case, modes will
    be 0, but there is still lowering to be done.

    This reverts commit 7f75cf2a9408b9af562e033ef6c1d1fd15141421.

    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109081
    Suggested-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    Tested-by: Clayton Craft <clayton.a.craft at intel.com>
    Cc: Kenneth Graunke <kenneth at whitecape.org>
    (cherry picked from commit 29e4b949b45b468c366b9865298391c89ba6642c)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d61fffdc596b1b4aa95f8bcc8a45bf9280fd891b
Author: Vinson Lee <vlee at freedesktop.org>
Date:   Tue Dec 18 09:42:04 2018 -0800

    meson: Fix libsensors detection.

    Fixes: 5e71efef44b9 ("meson: Add lmsensors support")
    Signed-off-by: Vinson Lee <vlee at freedesktop.org>
    Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
    (cherry picked from commit 0f7ba5758bd8a3e12b8b33ab471336eaa7dd6fbc)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=057d5bb6587a301cd58c808e94ec96c6bc0feb4a
Author: Vinson Lee <vlee at freedesktop.org>
Date:   Sun Dec 16 16:35:00 2018 -0800

    meson: Fix typo.

    Fixes: 6b4c7047d571 ("meson: build gallium nine state_tracker")
    Signed-off-by: Vinson Lee <vlee at freedesktop.org>
    Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
    (cherry picked from commit 84f39e5971d77549293a1b8abd479cca2ff4b97e)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=46d39ba5c9a7c54688ea04d60cfaac69960694c8
Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Tue Dec 4 09:28:10 2018 -0800

    meson: Fix ppc64 little endian detection

    Old versions of meson returned ppc64le as the cpu_family for little
    endian power8 cpus, versions >=0.48 don't do this, so the check wouldn't
    work in that case. This generalizes the check to work for both old and
    new versions of meson.

    Fixes: 34bbb24ce7702658cdc4e9d34a650e169716c39e
           ("meson: Add support for ppc assembly/optimizations")
    Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
    (cherry picked from commit e430a034b9d2be626557931cd29808a3161889f1)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=344f1e2b8a167b0d100e0f7bdbe1cee4c4e5bf15
Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Wed Jun 20 17:18:30 2018 -0700

    i965/vec4/dce: Don't narrow the write mask if the flags are used

    In an instruction sequence like

                cmp(8).ge.f0.0 vgrf17:D, vgrf2.xxxx:D, vgrf9.xxxx:D
        (+f0.0) sel(8) vgrf1:UD, vgrf8.xyzw:UD, vgrf1.xyzw:UD

    The other fields of vgrf17 may be unused, but the CMP still needs to
    generate the other flag bits.

    To my surprise, nothing in shader-db or any test suite appears to hit
    this.  However, I have a change to brw_vec4_cmod_propagation that
    creates cases where this can happen.  This fix prevents a couple dozen
    regressions in that patch.

    Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
    Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
    Fixes: 5df88c20 ("i965/vec4: Rewrite dead code elimination to use live in/out.")
    (cherry picked from commit 440c051340669e809511c05370d6d703c70f6d0e)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=901b8c52b8d82a3a2c2dbdb22a51821c3ca4be74
Author: Juan A. Suarez Romero <jasuarez at igalia.com>
Date:   Wed Dec 19 12:46:14 2018 +0100

    cherry-ignore: radv: Fix multiview depth clears

    fixes: This commit requires commits aeaf8dbd097 and 7484bc894b9 which
    did not land in branch.

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

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3a6987b4ccfe2a28e030f62f1e8fff2854093133
Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Fri Dec 14 16:47:09 2018 +0000

    radv: don't set surf_index for stencil-only images

    Fixes: f8d5b377c8b ('radv: set cb base tile swizzles for MRT speedups (v4)')
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108116
    Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
    Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
    Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
    (cherry picked from commit bba94a3d85c8799b2441a5d41015091e8903738f)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4b5a4dbc545fe7fba99a5a1db631c8cae5b025cd
Author: Iago Toral Quiroga <itoral at igalia.com>
Date:   Mon May 28 13:03:24 2018 +0200

    intel/compiler: do not copy-propagate strided regions to ddx/ddy arguments

    The implementation of these opcodes in the generator assumes that their
    arguments are packed, and it generates register regions based on that
    assumption.

    Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
    (cherry picked from commit 391894321161b37a3f8ae1cae4ece6c72ea38bc1)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9384414767d319da8916afcf1ca678c2018735fd
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Wed Dec 19 15:39:56 2018 +0100

    nir/constant_folding: Fix source bit size logic

    Instead of looking at input_sizes[i] which contains the number of
    components for each source, we look at the bit size of input_types[i].
    This fixes a regression in the 1-bit boolean series though I have no
    idea how we haven't seen it before now.

    Fixes: 35baee5dce5 "nir/constant_folding: fix incorrect bit-size check"
    Fixes: 9076c4e289d "nir: update opcode definitions for different bit sizes"
    Reviewed-by: Eric Anholt <eric at anholt.net>
    Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
    Tested-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
    (cherry picked from commit 3595a0abf43be3ce27d88f5939b257a74e90035b)
    [Juan A. Suarez: resolve trivial conflicts]

    Conflicts:
    	src/compiler/nir/nir_opt_constant_folding.c

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=beec28d21b4fde1254cff2b0437429f475221f7e
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Fri Dec 14 13:20:10 2018 +0000

    glx: Fix compilation with GLX_USE_WINDOWSGL

    Sadly, the GLX_USE_APPLEGL and GLX_USE_WINDOWSGL cases are not identical
    (because GLX_USE_WINDOWSGL uses vtables rather than a maze of ifdefs)

    Include <sys/time.h> again, as functions prototyped by it are used in
    the GLX_USE_WINDOWSGL path.

    Make the include guard around the __glxGetMscRate() definition match the
    one at it's declaration again, as it's referenced from dri_common.c
    which is built for GLX_USE_WINDOWSGL.

    Fixes: a95ec138 ("glx: mandate xf86vidmode only for "drm" dri platforms")
    Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
    Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
    (cherry picked from commit d512b35b62ff928b880a67887d36f1568aaa5e4b)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e621aee78828ffa94498e9561139d7d1f0420f42
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Dec 10 16:47:13 2018 -0800

    v3d: Add missing flagging of SYNCB as a TSY op.

    Fixes: f2e41daac577 ("broadcom/vc5: Update QPU instruction pack/unpack for v4.2.")
    (cherry picked from commit ff80e58b38a13c97a4ee598497e3e7b886918087)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a52d12eec0b1013d149636fed2949ac8b3a35d7c
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Dec 11 16:14:03 2018 -0800

    v3d: Make sure that a thrsw doesn't split a multop from its umul24.

    The thrsw will invalidate rtop, just like accumulators and flags.  Caught
    by simulator assertions in CS imulextended/umulextended tests.

    Fixes: 90269ba35333 ("broadcom/vc5: Use THRSW to enable multi-threaded shaders.")
    (cherry picked from commit 3f9bcf9136af794d44fa4b0802c0d4df6b170175)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=edcbdea5a636982fca9305da59a85cb59318a152
Author: Jan Vesely <jan.vesely at rutgers.edu>
Date:   Thu Dec 13 15:53:42 2018 -0500

    clover: Fix build after clang r348827

    CodeGenOptions were moved to Basic.

    Signed-off-by: Jan Vesely <jan.vesely at rutgers.edu>
    Reviewed-by: Aaron Watry <awatry at gmail.com>
    Tested-by: Aaron Watry <awatry at gmail.com>
    Reviewed-by: Kai Wasserbäch <kai at dev.carbon-project.org>
    CC: mesa-stable at lists.freedesktop.org
    (cherry picked from commit e4f9a37ace750646fd75fbbdff9b5e77a0b26cfb)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7cde3dcf07b6d0e9a36cf4e7e92c09ddc9caac93
Author: Alex Deucher <alexander.deucher at amd.com>
Date:   Fri Dec 7 16:10:33 2018 -0500

    pci_ids: add new vega20 pci id

    Reviewed-by: Marek Olšák <marek.olsak at amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
    Cc: mesa-stable at lists.freedesktop.org
    (cherry picked from commit 4db4b3447d5258a26a805766e156ea0a338c95b7)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=51f1bd5827608d686bc5203b4c39f58c758bb0ac
Author: Alex Deucher <alexander.deucher at amd.com>
Date:   Fri Dec 7 16:09:16 2018 -0500

    pci_ids: add new vega10 pci ids

    Reviewed-by: Marek Olšák <marek.olsak at amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
    Cc: mesa-stable at lists.freedesktop.org
    (cherry picked from commit 56cf25a114436dfc4006296ecef820057f7391b6)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=46e102d963a48d5160d9b005c1c5784aa2d87334
Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Tue Dec 11 16:20:40 2018 +0000

    glx: mandate xf86vidmode only for "drm" dri platforms

    Currently we have the three dri "platforms" - drm, apple and windows.

    Since xf86vidmode is a thing only for the drm one, adjust the
    preprocessor guards and correctly check for the dependency.

    v2: terminate the GLX_USE_WINDOWSGL hunk

    Cc: Jon TURNEY <jon.turney at dronecode.org.uk>
    Fixes: 5bc509363b6 ("glx: make xf86vidmode mandatory for direct rendering")
    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
    Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
    Acked-by: Eric Engestrom <eric.engestrom at intel.com>
    (cherry picked from commit a95ec13879d4f04d01fc04a62503578e85c846a8)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bff2986b3c0b31096af573ee6eada2fffe8b3cfc
Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Tue Dec 11 14:02:53 2018 +0000

    virgl: work around bad assumptions in virglrenderer

    Virglrenderer does the wrong thing when given an instance divisor;
    it tries to use the element-index rather than the binding-index as
    the argument to glVertexBindingDivisor(). This worked fine as long
    as there was a 1:1 relationship between elements and bindings,
    which was the case util 19a91841c34 "st/mesa: Use Array._DrawVAO in
    st_atom_array.c.".

    So let's detect instance divisors, and restore a 1:1 relationship in
    that case. This will make old versions of virglrenderer behave
    correctly. For newer versions, we can consider making a better
    interface, where the instance divisor isn't specified per element,
    but rather per binding. But let's save that for another day.

    Signed-off-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
    Fixes: 19a91841c34 "st/mesa: Use Array._DrawVAO in st_atom_array.c."
    Reviewed-by: Mathias Fröhlich <Mathias.Froehlich at web.de>
    Tested-By: Gert Wollny <gert.wollny at collabora.com>
    (cherry picked from commit e888f28d1fd9f125fc70b2f5d1b3c42d8f25ae53)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5efd0c35fb701537a1d17b7902b7691f5e1b593e
Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Tue Dec 11 12:34:38 2018 +0000

    virgl: wrap vertex element state in a struct

    This just has one member for now; the handle. But this is about to
    change.

    Signed-off-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
    Reviewed-by: Mathias Fröhlich <Mathias.Froehlich at web.de>
    Tested-By: Gert Wollny <gert.wollny at collabora.com>
    (cherry picked from commit 8447b64238773db0e365802315772d1819c1923f)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c57f3aaa47d02d12ecc2054d71d99fa85bc76e6b
Author: Juan A. Suarez Romero <jasuarez at igalia.com>
Date:   Fri Dec 14 12:02:26 2018 +0100

    cherry-ignore: meson: libfreedreno depends upon libdrm (for fence support)

    fixes: The changes this commit provides are already included in the
    branch.

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

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=316e388223943a6849a879206eddf0f8182a23ad
Author: Rob Clark <robdclark at gmail.com>
Date:   Sat Dec 8 13:21:52 2018 -0500

    mesa/st/nir: fix missing nir_compact_varyings

    LinkedTransformFeedback is normally populated, which had nerf'd varying
    packing since the check was introduced.

    Fixes: dbd52585fa9 st/nir: Disable varying packing when doing transform feedback.
    Signed-off-by: Rob Clark <robdclark at gmail.com>
    Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
    (cherry picked from commit cfe8220904b79ee45083970c0325bf59a140e163)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=69396e242bc9b4c45fdba4d0cfe9cfe2c5369b66
Author: Kirill Burtsev <kirill.burtsev at qt.io>
Date:   Wed Dec 5 15:54:27 2018 +0000

    loader: free error state, when checking the drawable type

    Currently we distinguish if the drawable is a window or pixmap by
    checking xcb_present_select_input throws an error or not.

    Yet, we don't always free the error state returned by xcb.

    Cc: Kirill Burtsev <kirill.burtsev at qt.io>
    Cc: Boyan Ding <boyan.j.ding at gmail.com>
    Fixes: 6bd9ba7d074 ("loader: Add dri3 helper")
    Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
    [Emil: add commit message, fixes tag]
    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
    (cherry picked from commit a539316485ddda074ca1b71aebf4a29b65af87c3)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=eb04300772b83f2ef19777cb2a1d6cf4919cfa1d
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Tue Oct 9 14:15:12 2018 +0200

    radv: switch on EOP when primitive restart is enabled with triangle strips

    Otherwise, Yakuza hangs the GPU with DXVK. We don't know if
    linetrip and pointlist are affected, so my point is to do that
    only for triangle strips.

    Cc: 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 d8325f1f07b67c8a31c6786c71e3fd0910bc3b82)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a968e08d9323fa8150b11f4444d07691490b7b89
Author: Juan A. Suarez Romero <jasuarez at igalia.com>
Date:   Fri Dec 14 09:03:26 2018 +0100

    cherry-ignore: add explicit 18.3 only nominations

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