Mesa (11.0): 30 new commits

Emil Velikov evelikov at kemper.freedesktop.org
Sat Nov 7 15:16:47 UTC 2015


URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=774dd015bd88f1d4cff4d792d15d295e8d7f4d2a
Author: Julien Isorce <j.isorce at samsung.com>
Date:   Fri Oct 30 11:42:51 2015 +0000

    st/va: add more errors checks in vlVaBufferSetNumElements and vlVaMapBuffer
    
    Signed-off-by: Julien Isorce <j.isorce at samsung.com>
    Reviewed-by: Christian König <christian.koenig at amd.com>
    (cherry picked from commit 5e763aaa21654d0591b7da14c573fc03d4a60205)
    Nominated-by: Emil Velikov <emil.velikov at collabora.co.uk>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=507b589685a9f675eea41f584e94250c2d19e8ba
Author: Julien Isorce <j.isorce at samsung.com>
Date:   Fri Oct 30 11:42:45 2015 +0000

    st/va: do not destroy old buffer when new one failed
    
    If formats are not the same vlVaPutImage re-creates the video
    buffer with the right format. But if the creation of this new
    video buffer fails then the surface looses its current buffer.
    Let's just destroy the previous buffer on success.
    
    Signed-off-by: Julien Isorce <j.isorce at samsung.com>
    Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
    Reviewed-by: Christian König <christian.koenig at amd.com>
    (cherry picked from commit d42029d2d9bc6b65ccf847dc9ba2e70b496d0299)
    Nominated-by: Emil Velikov <emil.velikov at collabora.co.uk>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bc47b385b4dd2ad1362872bb01a22a5cd50a42c0
Author: Julien Isorce <j.isorce at samsung.com>
Date:   Tue Oct 20 17:34:23 2015 +0100

    nvc0: fix crash when nv50_miptree_from_handle fails
    
    Signed-off-by: Julien Isorce <j.isorce at samsung.com>
    Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
    (cherry picked from commit 3bbb8715acd1cb85ea7aa7763c06cd12347a1a9a)
    Nominated-by: Emil Velikov <emil.velikov at collabora.co.uk>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=dff2b9ed8a8f49d00880a28796841fc0d0c7ec4f
Author: Julien Isorce <j.isorce at samsung.com>
Date:   Fri Oct 23 13:25:47 2015 +0100

    st/va: pass picture desc to begin and decode
    
    At least vl_mpeg12_decoder uses the picture
    desc in begin_frame and decode_bitstream.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=92634
    
    Signed-off-by: Julien Isorce <j.isorce at samsung.com>
    Reviewed-by: Christian König <christian.koenig at amd.com>
    (cherry picked from commit a61be1a79897931e3efb5b9119c48e1fb1257db4)
    Nominated-by: Emil Velikov <emil.velikov at collabora.co.uk>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a4fbfc8189c05f5ac0ece8f59ef79155cf60b67e
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Wed Nov 4 22:42:41 2015 -0500

    nouveau: relax fence emit space assert
    
    We also have the "reserved for kick" space available. Some of my earlier
    changes can probably be removed, but this is a quick fix for some of the
    rarer fallout.
    
    Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
    Cc: <mesa-stable at lists.freedesktop.org>
    (cherry picked from commit bb73fc4cb82c1abdf47aa373c78c2a85fe29b3ec)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c323f97963dbbf069352fb40a7daa4a031aa87ba
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Nov 4 13:27:16 2015 -0800

    vc4: When the create ioctl fails, free our cache and try again.
    
    This greatly increases the pressure you can put on the driver before
    create fails.  Ultimately we need to let the kernel take control of
    our cached BOs and just take them from us (and other clients)
    directly, but this is a very easy patch for the moment.
    
    Cc: "11.0" <mesa-stable at lists.freedesktop.org>
    (cherry picked from commit 6d3a24bce80a32063aedfe568efd5532aea4c875)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7cfd87ce84f259f928efaaa4d2a5e340634ed058
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Nov 2 21:43:40 2015 -0800

    nir: Properly invalidate metadata in nir_opt_remove_phis().
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>
    Reviewed-by: Eduardo Lima Mitev <elima at igalia.com>
    Cc: mesa-stable at lists.freedesktop.org
    (cherry picked from commit 59bbe2681b73c3795b7298e2486d5fde7c464ed5)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f565d7645f3a5138ad208875bce0efd32ea3bd8
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Nov 2 21:38:56 2015 -0800

    nir: Properly invalidate metadata in nir_lower_vec_to_movs().
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>
    Reviewed-by: Eduardo Lima Mitev <elima at igalia.com>
    Cc: mesa-stable at lists.freedesktop.org
    (cherry picked from commit bc3942e2970c60a816cf954b1fa4d416d0852bd9)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ef4e862396ae81b0d59f172d0d5273a4e6b5992d
Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Wed Sep 9 17:50:09 2015 -0700

    nir: Report progress from lower_vec_to_movs().
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>
    (cherry picked from commit 9f5e7ae9d83ce6de761936b95cd0b7ba4c1219c4)
    [Emil Velikov] Correctly derive nir_shader from vec_to_movs_state
    Signed-off-by: Emil Velikov <emil.velikov at collabora.co.uk>
    
    Conflicts:
            src/glsl/nir/nir.h
            src/glsl/nir/nir_lower_vec_to_movs.c

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2cc4e973962c1d5ea0357685036879c7bf9575ce
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Wed Sep 9 12:58:58 2015 -0700

    nir/lower_vec_to_movs: Pass the shader around directly
    
    Previously, we were passing the shader around, we were just calling it
    "mem_ctx".  However, the nir_shader is (and must be for the purposes of
    mark-and-sweep) the mem_ctx so we might as well pass it around explicitly.
    
    Reviewed-by: Eduardo Lima Mitev <elima at igalia.com>
    (cherry picked from commit b7eeced3c724bf5de05290551ced8621ce2c7c52)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ba0c78f4e278a89e6871ac334819e73e41ddc94d
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Nov 2 21:21:25 2015 -0800

    nir: Properly invalidate metadata in nir_opt_copy_prop().
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>
    Reviewed-by: Eduardo Lima Mitev <elima at igalia.com>
    Cc: mesa-stable at lists.freedesktop.org
    (cherry picked from commit 0f037bd71ffe083c05cd0867ef54bce91ff84243)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a4b73eeff083d04585ef4ea411f4fff45ea80b47
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Nov 2 21:05:08 2015 -0800

    nir: Properly invalidate metadata in nir_split_var_copies().
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>
    Reviewed-by: Eduardo Lima Mitev <elima at igalia.com>
    Cc: mesa-stable at lists.freedesktop.org
    (cherry picked from commit 8bb44510fca5315bbdd61502c72c22c7198c0daf)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=800217a1654ab7932870b1510981f5e38712d58b
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Thu Sep 17 12:33:36 2015 -0700

    nir: Report progress from nir_split_var_copies().
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>
    (cherry picked from commit dc18b9357b553a972ea439facfbc55e376f1179f)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=aa739dff86e4adb0b746568f7608bb57f90ceb6f
Author: Ben Widawsky <benjamin.widawsky at intel.com>
Date:   Thu Oct 29 17:30:35 2015 -0700

    i965/skl: Add GT4 PCI IDs
    
    Like other gen8+ hardware, the hardware automatically scales up thread counts.
    We must be careful about the URB sizes since GT4 adds another slice.
    
    One of the existing PCI IDs is actually mislabeled as GT3. Arguably this is a
    real bug since the URB size will be wrong. Because this patch is simply meant to
    add the missing IDs, that will be fixed in a later patch.
    
    v2: No longer relevant.
    
    v3: Update the wm thread count to support GT4. The WM thread count is used to
    determine the maximum scratch space required. Currently the code always
    allocates the maximum amount even though lower GT SKUs require less. The formula
    is threads_per_psd * subslices_per_slice * slices
    
    Cc: mesa-stable at lists.freedesktop.org
    Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
    Signed-off-by: Ben Widawsky <benjamin.widawsky at intel.com>
    (cherry picked from commit 7cbd6608f544591bc6aadf48877608b30a78ccb8)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=16bc98fb5e8366ba3e2148011f86a800c0a7fca7
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Sun Nov 1 20:13:13 2015 -0500

    nouveau: set MaxDrawBuffers to the same value as MaxColorAttachments
    
    Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
    Cc: mesa-stable at lists.freedesktop.org
    (cherry picked from commit 985b51551a9bafec86604714d5faf3065dad4812)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=addd501acd648ae9068b385b1037546a03186446
Author: Emmanuel Gil Peyrot <emmanuel.peyrot at collabora.com>
Date:   Thu Oct 29 15:22:19 2015 +0000

    gbm.h: Add a missing stddef.h include for size_t.
    
    This was causing compilation issues when one of its providers wasn’t
    already included before gbm.h.
    
    Cc: "11.0" <mesa-stable at lists.freedesktop.org>
    Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
    (cherry picked from commit f3d4d10a1d483cff7b3fbb6db4d6d752dd002243)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d9474cb70e5221b1a46172a760a4abc42e26e0af
Author: Ivan Kalvachev <ikalvachev at gmail.com>
Date:   Sun Oct 25 01:16:58 2015 +0300

    r600g: Fix special negative immediate constants when using ABS modifier.
    
    Some constants (like 1.0 and 0.5) could be inlined as immediate inputs
    without using their literal value. The r600_bytecode_special_constants()
    function emulates the negative of these constants by using NEG modifier.
    
    However some shaders define -1.0 constant and want to use it as 1.0.
    They do so by using ABS modifier. But r600_bytecode_special_constants()
    set NEG in addition to ABS. Since NEG modifier have priority over ABS one,
    we get -|1.0| as result, instead of |1.0|.
    
    The patch simply prevents the additional switching of NEG when ABS is set.
    
    [According to Ivan Kalvachev, this bug was fond via
    https://github.com/iXit/Mesa-3D/issues/126 and
    https://github.com/iXit/Mesa-3D/issues/127]
    
    Signed-off-by: Ivan Kalvachev <ikalvachev at gmail.com>
    Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
    CC: <mesa-stable at lists.freedesktop.org>
    (cherry picked from commit f75f21a24ae2dd83507f3d4d8007f0fcfe6db802)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7aba6fa3eb0c6b3f6d12d1bed92888e502dbb4a1
Author: Nicolai Hähnle <nhaehnle at gmail.com>
Date:   Fri Oct 23 01:06:15 2015 +0200

    st/mesa: fix mipmap generation for immutable textures with incomplete pyramids
    
    Without the clamping by NumLevels, the state tracker would reallocate the
    texture storage (incorrect) and even fail to copy the base level image
    after reallocation, leading to the graphical glitch of
    https://bugs.freedesktop.org/show_bug.cgi?id=91993 .
    
    A piglit test has been submitted for review as well (subtest of
    arb_texture_storage-texture-storage).
    
    v2: also bypass all calls to st_finalize_texture (suggested by Marek Olšák)
    
    Cc: mesa-stable at lists.freedesktop.org
    Reviewed-by: Marek Olšák <marek.olsak at amd.com>
    (cherry picked from commit 24c90888aeaf90b13700389b91b74bf63ee9f28d)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=05fdf4b1c94818c65ef86dbee12ad5a20071c859
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Wed Oct 28 00:53:20 2015 -0700

    i965: Fix missing BRW_NEW_*_PROG_DATA flagging caused by cache reuse.
    
    Consider the case of two nearly identical GLSL fragment shaders:
    
       out vec4 color;
       void main() { color = vec4(1); }
    
    and
    
       layout(early_fragment_tests) in;
       out vec4 color;
       void main() { color = vec4(1); }
    
    These shaders compile to the exact same assembly, but have distinct
    values for brw_wm_prog_data::early_fragment_tests.
    
    Since these are two independent GLSL shaders, they have different
    program keys - notably, brw_wm_prog_key::program_string_id differs.
    
    When uploading the second, brw_upload_cache will find an existing copy
    of the assembly in the cache BO, which means matching_data will be
    non-NULL.  Although we create a second cache item (with the new key
    and prog_data), we set item->offset to the existing copy and avoid
    re-uploading duplicate assembly.
    
    However, brw_search_cache() would only flag BRW_NEW_*_PROG_DATA if
    item->offset differed from the supplied offset.  With reuse, both
    programs have the same offset, but prog_data changed.  We have to
    flag it, but failed to.
    
    To fix this, we simply need to check if the aux (prog_data) pointer
    changed.  If either the assembly or the prog_data differs, flag it.
    
    This fixes a regression since 1bba29ed403e735ba0bf04ed8aa2e571884f,
    where Topi fixed brw_upload_cache() to actually reuse identical
    assembly.  Prior to that, reuse basically never happened due to bugs.
    Unfortunately, this code apparently wasn't prepared to handle reuse!
    
    Fixes GPU hangs in Dolphin on Broadwell.
    
    Huge thanks to Pierre Bourdon and Ilia Mirkin for debugging this
    and helping track down the real issue.
    
    Cc: "11.0" <mesa-stable at lists.freedesktop.org>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92623
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
    Reviewed-by: Kristian Høgsberg <krh at bitplanet.net>
    Tested-by: Pierre Bourdon <delroth at gmail.com>
    (cherry picked from commit bf05af3f0e8769f417bbd995470dc1b8083a0df9)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d8c58ff25a3a340990d7d1f69e4cb436ae2bab17
Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Thu Oct 15 12:50:12 2015 -0700

    i965: Fix is-renderable check in intel_image_target_renderbuffer_storage
    
    Previously we could create a renderbuffer with format
    MESA_FORMAT_R8G8B8A8_UNORM, convert that renderbuffer to an EGLImage,
    then FAIL to convert the EGLImage back to a renderbuffer because
    reasons.  Just use the same check in
    intel_image_target_renderbuffer_storage that brw_render_target_supported
    uses.
    
    There are more checks in brw_render_target_supported, but I don't think
    they are necessary here.  A different approach would be to refactor
    brw_render_target_supported to take rb->Format and rb->NumSamples as
    parameters (instead of a gl_renderbuffer) and use the new function here.
    
    Fixes:
    
        ES2-CTS.gtf.GL2ExtensionTests.egl_image.egl_image
    
    Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
    Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
    Tested-by: Tapani Pälli <tapani.palli at intel.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92476
    Cc: "10.3 10.4 10.5 10.6 11.0" <mesa-stable at lists.freedesktop.org>
    (cherry picked from commit 7070c8879adff2a1204d7473f119d8194eff919b)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f86028cf07db1c157a1e8457cc91ad07a1dc3e98
Author: Samuel Li <samuel.li at amd.com>
Date:   Thu Oct 22 12:06:43 2015 -0400

    radeonsi: add Stoney pci ids
    
    Reviewed-by: Marek Olšák <marek.olsak at amd.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
    Signed-off-by: Samuel Li <samuel.li at amd.com>
    Cc: mesa-stable at lists.freedesktop.org
    (cherry picked from commit 98546bfd038bc07a8cc7fed259c5022486bba473)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=64e903f82e89eb5e8310cc706602eb25a6166e1d
Author: Samuel Li <samuel.li at amd.com>
Date:   Fri Aug 21 15:35:46 2015 -0400

    radeonsi: add support for Stoney asics (v3)
    
    v2 (agd): rebase on mesa master, split pci ids to
    separate commit
    v3 (agd): use carrizo for llvm processor name for
    llvm 3.7 and older
    
    Reviewed-by: Marek Olšák <marek.olsak at amd.com>
    Signed-off-by: Samuel Li <samuel.li at amd.com>
    Cc: mesa-stable at lists.freedesktop.org
    (cherry picked from commit bf0d0ce0d57dce5df8195942d2eda6389d341fea)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=55cd3ab8e7abeb2d28051c08e71e69931b4e5598
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Fri Oct 23 02:14:31 2015 -0400

    nvc0: respect edgeflag attribute width
    
    The edgeflag comes in as ubyte with glEdgeFlagPointer but as float with
    plain immediate glEdgeFlag. Avoid reading bytes that weren't meant for
    the edgeflag in the pointer case.
    
    Fixes intermittent failures with gl-2.0-edgeflag piglit (and valgrind
    complaints about reading uninitialized memory).
    
    Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
    Cc: mesa-stable at lists.freedesktop.org
    (cherry picked from commit e05021ff72abb7de6506c90dd70a9f7ab490bf90)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4a4e148ac72dcdea3bcfde880ae7fddf7b72506c
Author: Roland Scheidegger <sroland at vmware.com>
Date:   Mon Oct 26 16:44:47 2015 +0100

    gallivm: disable f16c when not using AVX
    
    f16c intrinsic can only be emitted when AVX is used. So when we disable AVX
    due to forcing 128bit vectors we must not use this intrinsic (depending on
    llvm version, this worked previously because llvm used AVX even when we didn't
    tell it to, however I've seen this fail with llvm 3.3 since
    718249843b915decf8fccec92e466ac1a6219934 which seems to have the side effect
    of disabling avx in llvm albeit it only touches sse flags really, but
    with ea421e919ae6e72e1319fb205c42a6fb53ca2f82 it's now really disabled).
    Albeit being able to use AVX with 128bit vectors also would have its uses, the
    code as is really was meant to emulate jit code creation for less capable cpus.
    v2: add some (ifdefed out) missing de-featuring options for simulating
    less capable cpus.
    
    Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
    Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
    (cherry picked from commit 711489648bcce5cd8fcf14e73e5affe069010c01)
    Nominated-by: Roland Scheidegger <sroland at vmware.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7f6f273a55050c776828b8f1a536ce7ab5fd4127
Author: Jose Fonseca <jfonseca at vmware.com>
Date:   Fri Oct 23 11:40:25 2015 +0100

    gallivm: Explicitly disable unsupported CPU features.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92214
    CC: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
    Reviewed-by: Roland Scheidegger <sroland at vmware.com>
    (cherry picked from commit ea421e919ae6e72e1319fb205c42a6fb53ca2f82)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ce639c00101e338677cc26fb6173e3c5b9d2288
Author: Alex Deucher <alexander.deucher at amd.com>
Date:   Thu Oct 22 12:24:42 2015 -0400

    radeon/uvd: don't expose HEVC on old UVD hw (v3)
    
    The section for UVD 2 and older was not updated
    when HEVC support was added. Reported by Kano
    on irc.
    
    v2: integrate the UVD2 and older checks into the
    main switch statement.
    v3: handle encode checking as well.  Encode is
    already checked in the top case statement, so
    drop encode checks in the lower case statement.
    
    Reviewed-by: Christian König <christian.koenig at amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
    Cc: mesa-stable at lists.freedesktop.org
    (cherry picked from commit 7b636581253fe858ac883e3d3eec21173ac069d4)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=38a8b467cb2404c0fc488dfbf0d9af4af925fa87
Author: Jose Fonseca <jfonseca at vmware.com>
Date:   Wed Oct 21 17:19:41 2015 +0100

    gallivm: Translate all util_cpu_caps bits to LLVM attributes.
    
    This should prevent disparity between features Mesa and LLVM
    believe are supported by the CPU.
    
    http://lists.freedesktop.org/archives/mesa-dev/2015-October/thread.html#96990
    
    Tested on a i7-3720QM w/ LLVM 3.3 and 3.6.
    
    v2: Increase SmallVector initial size as suggested by Gustaw Smolarczyk.
    
    Reviewed-by: Roland Scheidegger <sroland at vmware.com>
    CC: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
    (cherry picked from commit 718249843b915decf8fccec92e466ac1a6219934)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2294f6f3112f34c4685586f95cd567ce130ee1ab
Author: Nanley Chery <nanley.g.chery at intel.com>
Date:   Thu Oct 8 16:44:30 2015 -0700

    mesa/glformats: Undo code changes from _mesa_base_tex_format() move
    
    The refactoring commit, c6bf1cd, accidentally reverted cd49b97
    and 99b1f47. These changes caused more code to be added to the
    function and removed the existing support for ASTC. This patch
    reverts those modifications.
    
    v2. Actually include ASTC support again.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92221
    Cc: "11.0" <mesa-stable at lists.freedesktop.org>
    Signed-off-by: Nanley Chery <nanley.g.chery at intel.com>
    Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
    (cherry picked from commit f1147a238ab35a56fa7d1c64f6025ff3b909dad8)
    [Emil Velikov]
     - Drop the KHR_texture_compression_astc_ldr check
     - Add texcompress.h include.
    Signed-off-by: Emil Velikov <emil.velikov at collabora.co.uk>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a333791259686b8b4bf60dd50b7500b81459c572
Author: Nigel Stewart <nigels at users.sourceforge.net>
Date:   Mon Oct 12 21:26:37 2015 +1000

    osmesa: Expose GL entry points for Windows build via DEF file.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92437
    CC: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
    Signed-off-by: Jose Fonseca <jfonseca at vmware.com>
    (cherry picked from commit 04703762e544bc732f6f8b07033221dfbd58159f)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bfd14ebb0519125190b24301b724985bb72dbded
Author: Emil Velikov <emil.velikov at collabora.co.uk>
Date:   Thu Nov 5 11:29:44 2015 +0000

    cherry-ignore: ignore a possible wrong nomination
    
    The commit base varies greatly between master and 11.0. It seems that
    the commit (in it's current form) is not applicable for the branch.
    
    Signed-off-by: Emil Velikov <emil.velikov at collabora.co.uk>




More information about the mesa-commit mailing list