Mesa (10.6): 28 new commits

Emil Velikov evelikov at kemper.freedesktop.org
Fri Aug 7 13:55:44 UTC 2015


URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=736f6e16d9989f01cc55dcba15ba978ba90b7748
Author: Francisco Jerez <currojerez at riseup.net>
Date:   Wed Aug 5 16:29:30 2015 +0300

    i965/fs: Fix fs_inst::regs_read() for sources in the ATTR file.
    
    Otherwise it would crash on Gen8 with scalar VS.  The issue can easily
    be reproduced with the following patch, but I don't see any reason why
    it wouldn't be possible to end up with an ATTR argument here even
    without it.
    
    CC: mesa-stable at lists.freedesktop.org
    Reviewed-by: Connor Abbott <connor.w.abbott at intel.com>
    Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
    (cherry picked from commit 42a18ca76057621ae7d8812b29ea2245d6ff282d)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f13ba8a5ab537e6dcdcc8b0c1a814012202d2497
Author: Eduardo Lima Mitev <elima at igalia.com>
Date:   Wed Jul 29 16:01:28 2015 +0200

    mesa: Fix error returned by glCopyTexImage2D() upon an invalid internal format
    
    Page 161 of the OpenGL-ES 3.1 (PDF) spec, and page 207 of the OpenGL 4.5 (PDF),
    both on section '8.6. ALTERNATE TEXTURE IMAGE SPECIFICATION COMMANDS', states:
    
        "An INVALID_ENUM error is generated if an invalid value is specified for
         internalformat".
    
    It is currently returning INVALID_OPERATION error because
    _mesa_get_read_renderbuffer_for_format() is called before the internalformat
    argument has been validated. To fix this, we move this call down the validation
    process, after _mesa_base_tex_format() has been called. _mesa_base_tex_format()
    effectively serves as a validator for the internal format.
    
    Fixes 1 dEQP test:
    * dEQP-GLES3.functional.negative_api.texture.copyteximage2d_invalid_format
    
    Fixes 1 piglit test:
    * spec at oes_compressed_etc1_rgb8_texture@basic
    
    Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
    Cc: 10.6 <mesa-stable at lists.freedesktop.org>
    (cherry picked from commit 4b07e9a033ddb6733eba206b5bd47a2373756f7d)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=791cf8a025ac0d610596cdfab17fc84b49df2288
Author: Eduardo Lima Mitev <elima at igalia.com>
Date:   Wed Jul 29 16:01:26 2015 +0200

    mesa: Validate target before resolving tex obj in glTex(ture)SubImageXD
    
    Currently, glTexSubImageXD attempt to resolve the texture object
    (by calling _mesa_get_current_tex_object()) before validating the given
    target. However, that method explicitly states that target must have been
    validated before calling it, so it never returns a user error.
    
    The target validation occurs later when texsubimage_error_check() is called.
    
    This patch reorganizes target validation, taking it out from the error check
    function and into a point before the texture object is resolved.
    
    Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
    Cc: 10.6 <mesa-stable at lists.freedesktop.org>
    (cherry picked from commit 5d64cae8427b090c42d6d38da7fb474b3ddd4eb0)
    [Emil Velikov: s/_mesa_enum_to_string/_mesa_lookup_enum_by_nr/]
    Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
    
    Conflicts:
    	src/mesa/main/teximage.c

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=58b2e95c1f09aafdfe5434f433ed7dc7a628e7a8
Author: Eduardo Lima Mitev <elima at igalia.com>
Date:   Wed Jul 29 16:01:23 2015 +0200

    mesa: Fix errors values returned by glShaderBinary()
    
    Page 68, section 7.2 'Shader Binaries" of the of the OpenGL ES 3.1,
    and page 88 of the OpenGL 4.5 specs state:
    
        "An INVALID_VALUE error is generated if count or length is negative.
         An INVALID_ENUM error is generated if binaryformat is not a supported
         format returned in SHADER_BINARY_FORMATS."
    
    Currently, an INVALID_OPERATION error is returned for all cases.
    
    Fixes 1 dEQP test:
    * dEQP-GLES3.functional.negative_api.shader.shader_binary
    
    Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
    Cc: 10.6 <mesa-stable at lists.freedesktop.org>
    (cherry picked from commit b38a50f1e3edae6079c91f73a8d9c63a2dbf512a)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1f6798a70a6d7e6db636decc6af752f9a7714906
Author: Frank Binns <frank.binns at imgtec.com>
Date:   Fri Jul 31 09:11:45 2015 +0100

    egl: Add eglQuerySurface surface type check for EGL_LARGEST_PBUFFER attrib
    
    Calling eglQuerySurface on a window or pixmap with the EGL_LARGEST_PBUFFER
    attribute resulted in the contents of the 'value' parameter being modified.
    This is the wrong behaviour according to the EGL spec, which states:
    
        "Querying EGL_LARGEST_PBUFFER for a pbuffer surface returns the
         same attribute value specified when the surface was created with
         eglCreatePbufferSurface. For a window or pixmap surface, the
         contents of value are not modified."
    
    Avoid this from happening by checking that the surface type is EGL_PBUFFER_BIT
    before modifying the contents of the parameter.
    
    Cc: <mesa-stable at lists.freedesktop.org>
    Signed-off-by: Frank Binns <frank.binns at imgtec.com>
    Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
    Reviewed-by: Eric Anholt <eric at anholt.net>
    (cherry picked from commit b2c5986ea1c8e66c4e0a05bcacbcf28c27f5b183)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=84ef345dffec02d790db13fd6257e2c08eb0d56a
Author: Frank Binns <frank.binns at imgtec.com>
Date:   Fri Jul 31 09:11:46 2015 +0100

    egl/dri: Add error info needed for EGL_EXT_image_dma_buf_import extension
    
    Update the DRI image interface error codes to reflect the needs of the
    EGL_EXT_image_dma_buf_import extension. This means updating the existing error
    code documentation and adding a new __DRI_IMAGE_ERROR_BAD_ACCESS error code
    so that drivers can correctly reject unsupported pitches and offsets. Hook
    the new error code up in EGL to return EGL_BAD_ACCESS.
    
    Cc: <mesa-stable at lists.freedesktop.org>
    Signed-off-by: Frank Binns <frank.binns at imgtec.com>
    Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
    Reviewed-by: Eric Anholt <eric at anholt.net>
    (cherry picked from commit cfc3200a35647026a0b5cf188f378ce33802044b)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7722a24cab4b8880d45fb723205e2eedfada2055
Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sun Aug 2 15:18:36 2015 +0200

    r600g: fix the CB_SHADER_MASK setup
    
    This fixes the single-sample fast clear hang.
    
    Cc: 10.6 <mesa-stable at lists.freedesktop.org>
    Tested-by: Dieter Nützel <Dieter at nuetzel-hh.de>
    Reviewed-by: Dave Airlie <airlied at redhat.com>
    (cherry picked from commit d4ad4c20617f45f71152e292ee39f020ef352bfd)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=880a0ce2e973d5ed9ee28c3f48fc5332128f9652
Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sat Jul 25 00:53:16 2015 +0200

    radeonsi: completely rework updating descriptors without CP DMA
    
    For 10.6: This fixes graphical corruption occuring on most Southern Islands
    Radeon GPUs. This will allow closing a lot of bugs in the bugzilla.
    
    The patch has a better explanation. Just a summary here:
    - The CPU always uploads a whole descriptor array to previously-unused memory.
    - CP DMA isn't used.
    - No caches need to be flushed.
    - All descriptors are always up-to-date in memory even after a hang, because
      CP DMA doesn't serve as a middle man to update them.
    
    This should bring:
    - better hang recovery (descriptors are always up-to-date)
    - better GPU performance (no KCACHE and TC flushes)
    - worse CPU performance for partial updates (only whole arrays are uploaded)
    - less used IB space (no CP_DMA and WRITE_DATA packets)
    - simpler code
    - corruption issues are fixed on SI cards
    
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
    (cherry picked from commit b0528118dfb1af00e7d08cdb637191b80c14c2ba)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=842a3af20b6d5dc12e2025be8005531d5da6285c
Author: Marek Olšák <marek.olsak at amd.com>
Date:   Mon Sep 15 23:34:28 2014 +0200

    radeonsi: rework how shader pointers to descriptors are set
    
    For 10.6: This is a prerequisite for the next fix. The below comment is from
    the original commit.
    
    This is mainly needed for tessellation where a VS can be bound as VS, ES,
    or LS, and TES (tess. evaluationshader) can be bound as VS or ES or neither.
    Therefore we need the ability to move pointers to descriptors between
    shaders arbitrarily.
    
    The idea is that the context has a mapping from PIPE_SHADER_x to
    SPI_SHADER_USER_DATA_x. After a shader is enabled or disabled,
    si_shader_change_notify should be called to update this mapping accordingly.
    
    There is a dirty flag for each shader pointer, but only one emit function
    for all pointers in the whole context, whose code and logic is separated
    from descriptors.
    
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
    (cherry picked from commit 3ce91c727f2a00a05f414351266b0b45d677611e)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bc29f8f6b7b4a9bf575e401bd08bebe87d7dc863
Author: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date:   Tue Jul 7 13:05:04 2015 +0300

    opencl: use versioned .so in mesa.icd
    
    We must have versioned library in mesa.icd, because ICD loader would
    fail if the mesa-devel package wasn't installed.
    
    Cc: "10.6" <mesa-stable at lists.freedesktop.org>
    Reported-by: Fabian Deutsch <fabian.deutsch at gmx.de>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73512
    Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>
    Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
    Acked-by: Michel Dänzer <michel.daenzer at amd.com>
    (cherry picked from commit 4d7e0fa8c731776ad5d630f37b36c535f1907371)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f2f62059dc5c9b548127c31bc7875c6836716944
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Mon Jul 13 20:01:39 2015 +0100

    bugzilla_mesa.sh: sort the bugs list by number
    
    v2: Use change sed/sort based on Ilia's suggestion.
    
    Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
    (cherry picked from commit c505064b2cea14c9da115a26e9326b9c0c7dca3b)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2a72e18abbe9286d16e388eb1a004147f0b6e54b
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Mon Jul 6 23:34:23 2015 +0200

    nv50: avoid segfault with enabled but unbound vertex attrib
    
    Before validating vertex arrays we need to check if a VBO is present.
    Checking if vb->buffer is not NULL fixes the issue.
    
    Fixes the following piglit test:
      gl-3.1-vao-broken-attrib
    
    Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
    Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
    (cherry picked from commit adc816a1e41812e6489a5bc388f80de65504be5b)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b70176d96b1b5033d4bc1414fd63758ebd144787
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Wed Jul 29 15:44:32 2015 +0100

    winsys/radeon: don't leak the fd when it is 0
    
    Earlier commit added an extra dup(fd) to fix a ZaphodHeads issue.
    Although it did not consider the (very unlikely) case where we might end
    up with the valid fd == 0.
    
    Fixes: 28dda47ae4d(winsys/radeon: Use dup fd as key in drm-winsys hash
    table to fix ZaphodHeads.)
    
    Cc: 10.6 <mesa-stable at lists.freedesktop.org>
    Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
    Reviewed-by: Mario Kleiner <mario.kleiner.de at gmail.com>
    (cherry picked from commit 1307be519b8785249ee863a22115930299ff642a)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d8116f8ec531980d287e5fcb1091acfe2fcffb8d
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Fri Jul 10 11:01:55 2015 +0100

    egl/wayland: libdrm is a hard requirement, treat it as such
    
    Prompt at configure time if it's missing otherwise we'll fail later on
    in the build. Remove ambiguous HAVE_LIBDRM guard.
    
    Cc: 10.6 <mesa-stable at lists.freedesktop.org>
    Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
    (cherry picked from commit fa109d02dda118f756903b663879375c06353ae7)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8f8c842338b11185e8432e4b44e31a85abcbf9c6
Author: Ben Widawsky <benjamin.widawsky at intel.com>
Date:   Wed Jul 29 12:35:24 2015 -0700

    i965/skl: Add production thread counts and URB size
    
    This patch adjusts the SKL values to the best known values we have.
    
    v2: Remove HS/DS/CS fields. Adding this makes most sense to add to the
    GEN9_FEATURES macro, however, doing that would require updating BXT values, and
    Jordan requested I not do that. Conveniently, this request makes a lot of sense
    wrt to stable backport as HS, and DS do not even exist there.
    
    Cc: mesa-stable at lists.freedesktop.org
    Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
    Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
    (cherry picked from commit 7eaacc1678195738fab3bb98870828611cae066d)
    [Emil Velikov: .supports_simd16_3src is missing in 10.6]
    Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
    
    Conflicts:
    	src/mesa/drivers/dri/i965/brw_device_info.c

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=eddea78fb36039e03478e11780c8a32c06c1c435
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Wed Jul 22 20:08:23 2015 -0700

    glsl: Fix a bug where LHS swizzles of swizzles were too small.
    
    A simple shader such as
    
       vec4 color;
       color.xy.x = 1.0;
    
    would cause ir_assignment::set_lhs() to generate bogus IR:
    
       (swiz xy (swiz x (constant float (1.0))))
    
    We were setting the number of components of each new RHS swizzle based
    on the highest channel used in the LHS swizzle.  So, .xy.y would
    generate (swiz xy (swiz xx ...)), while .xy.x would break.
    
    Our existing Piglit test happened to use .xzy.z, which worked, since
    'z' is the third component, resulting in an xxx swizzle.
    
    This patch sets the number of swizzle components based on the size of
    the LHS swizzle's inner value, so we always have the correct number
    at each step.
    
    Fixes new Piglit tests glsl-vs-swizzle-swizzle-lhs-[23].
    Fixes ir_validate assertions in in Metro 2033 Redux.
    
    v2: Move num_components updating completely out of update_rhs_swizzle
        (suggested by Timothy Arceri).  Simplify.
    
    Cc: mesa-stable at lists.freedesktop.org
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Timothy Arceri <t_arceri at yahoo.com.au>
    (cherry picked from commit e235ca159f5f6de2bd29616fdda5c02dc69b0d7f)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=080c4713bcd4c0c3643b3fb3ede1aa09f891aecf
Author: Marek Olšák <marek.olsak at amd.com>
Date:   Fri Jul 24 19:47:06 2015 +0200

    st/mesa: don't ignore texture buffer state changes
    
    Fixes piglit:
      spec at arb_texture_buffer_range@ranges-2
    
    Cc: mesa-stable at lists.freedesktop.org
    Reviewed-by: Brian Paul <brianp at vmware.com>
    (cherry picked from commit e39ece0d7856d0532a0f011cd5cb17bc85ee82e2)
    [Emil Velikov: resolve tess related conflicts.]
    Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
    
    Conflicts:
    	src/mesa/state_tracker/st_atom_texture.c
    	src/mesa/state_tracker/st_context.c
    	src/mesa/state_tracker/st_context.h

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ba10c9ff5088b99591c13cad0b70929b49e6319c
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Sat Jul 11 12:47:03 2015 -0400

    nvc0: fix geometry program revalidation of clipping params
    
    Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
    Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
    Cc: mesa-stable at lists.freedesktop.org
    (cherry picked from commit a818faa6ddcfa6cd90a24b70c49ec76573954111)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f167d9b46cd41e8c750bdfd65a05c04545546236
Author: Anuj Phogat <anuj.phogat at gmail.com>
Date:   Tue May 12 05:46:04 2015 -0700

    meta: Fix reading luminance texture as rgba in _mesa_meta_pbo_GetTexSubImage()
    
    After recent addition of pbo testing in piglit test getteximage-luminance,
    it fails on i965. This patch makes a sub test pass.
    
    This patch adds a clear color operation to meta pbo path, which I think is
    better than falling back to software path.
    
    V2: Fix color mask for GL_LUMINANCE_ALPHA
    
    Cc: <mesa-stable at lists.freedesktop.org>
    Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
    Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
    (cherry picked from commit aa40546b2de4cd572af02d31fd5c7d4045505ea2)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=def2d2e018abbab381ea329a8472bded18b45659
Author: Anuj Phogat <anuj.phogat at gmail.com>
Date:   Thu Jun 11 16:48:26 2015 -0700

    mesa: Add a helper function _mesa_need_luminance_to_rgb_conversion()
    
    Cc: <mesa-stable at lists.freedesktop.org>
    Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
    Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
    (cherry picked from commit c59c0f8a42652603da7f89e3270897cb685fe76b)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=831bf63e6b55c4f1f610a2fb988906550157172a
Author: Anuj Phogat <anuj.phogat at gmail.com>
Date:   Wed May 6 05:43:08 2015 -0700

    meta: Don't do fragment color clamping in _mesa_meta_pbo_GetTexSubImage
    
    _mesa_meta_pbo_GetTexSubImage() uses _mesa_meta_BlitFrameBuffer(),
    which will do fragment clamping if enabled. But fragment clamping
    doesn't affect ReadPixels and GetTexImage.
    
    Without this patch, piglit test arb_color_buffer_float-clear fails,
    when forced to use the meta pbo path.
    
    v2: Apply this fix to both glReadPixels and glGetTexImage.
    
    Cc: <mesa-stable at lists.freedesktop.org>
    Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
    Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
    (cherry picked from commit ca4e17e03e9aeaa04fe6bb04bfe2d6f97991005b)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6321bf72be877fe3efc81bd9e3c6d645d6b6ed9a
Author: Anuj Phogat <anuj.phogat at gmail.com>
Date:   Wed May 20 10:22:45 2015 -0700

    meta: Abort meta pbo path if readpixels need signed-unsigned conversion
    
    Meta pbo path for ReadPixels rely on BlitFramebuffer which doesn't support
    signed to unsigned integer conversions and vice versa.
    
    Without this patch, piglit test fbo_integer_readpixels_sint_uint fails, when
    forced to use the meta pbo path.
    
    v2: Make need_signed_unsigned_int_conversion() a static function. (Iago)
        Bump up the comment and the commit message. (Jason)
    
    Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
    Cc: <mesa-stable at lists.freedesktop.org>
    Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>
    Reviewed-by: Iago Toral <itoral at igalia.com>
    (cherry picked from commit 0d207905e675b778739236072e7a4dfba7cd7959)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=acaac69ccd3d8d70044aab98dbadc5b177510eb5
Author: Anuj Phogat <anuj.phogat at gmail.com>
Date:   Wed May 20 10:21:39 2015 -0700

    meta: Fix transfer operations check in meta pbo path for readpixels
    
    Currently used ctx->_ImageTransferState check is not sufficient
    because it doesn't include the read color clamping enabled with
    GL_CLAMP_READ_COLOR. So, use the helper function
    _mesa_get_readpixels_transfer_ops().
    
    Also, transfer operations don't affect glGetTexImage(). So, do
    the check only for glReadPixles.
    
    Without this patch, arb_color_buffer_float-readpixels test fails, when
    forced to use meta pbo path.
    
    V2: Add a comment and bump up the commit message.
    
    Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
    Cc: <mesa-stable at lists.freedesktop.org>
    Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
    (cherry picked from commit 1252d53c19ec005c17ca666cecb7db072d77e5ce)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fbc464803a777bea4f9b7b11eeba192122adf8cb
Author: Anuj Phogat <anuj.phogat at gmail.com>
Date:   Tue May 19 17:44:52 2015 -0700

    mesa: Turn get_readpixels_transfer_ops() in to a global function
    
    This utility function is utilized in a later patch.
    
    Cc: <mesa-stable at lists.freedesktop.org>
    Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
    Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
    (cherry picked from commit 7974e23be9ff7586e5250cff321b6ec7749ecc44)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=56e4cc67fec63d86d76f5b4de55678890cf06648
Author: Samuel Iglesias Gonsalvez <siglesias at igalia.com>
Date:   Thu Jul 23 10:38:36 2015 +0200

    glsl/glcpp: fix SIGSEGV when checking error condition for macro redefinition
    
    Commit a6e9cd14c does not take into account than node_{a,b}->next could be NULL
    in some circumstances, such as in a shader containing this code:
    
      #define A 1 /* comment */
      #define A 1 /* comment */
    
    This patch fixes the segmentation fault for cases like that.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91290
    Signed-off-by: Samuel Iglesias Gonsalvez <siglesias at igalia.com>
    Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
    Cc: mesa-stable at lists.freedesktop.org
    (cherry picked from commit 30f97b5e52b324d501c56df8902d294fb755a5b7)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a31dfd91b500735c44bb89e194f02b718299bf2e
Author: Marek Olšák <marek.olsak at amd.com>
Date:   Fri Jul 10 23:35:55 2015 +0200

    radeonsi: upload shader rodata after updating scratch relocations
    
    Cc: 10.5 10.6 <mesa-stable at lists.freedesktop.org>
    Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
    (cherry picked from commit 50a957c5de842b18e10c361f7b0310aa46bb483f)
    Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
    
    Conflicts:
    	src/gallium/drivers/radeonsi/si_shader.c
    	src/gallium/drivers/radeonsi/si_shader.h

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=504903b827604f1a630a335d14231f88c2cf36be
Author: Marek Olšák <marek.olsak at amd.com>
Date:   Thu Jul 16 17:14:07 2015 +0200

    st/mesa: don't call st_validate_state in BlitFramebuffer
    
    None of the draw states are used here.
    This fixes a crash in piglit: ext_framebuffer_blit/blit-early
    
    Calling st_manager_validate_framebuffers is the minimum requirement here.
    
    Cc: mesa-stable at lists.freedesktop.org
    (cherry picked from commit d082c5324914212f76e45be497229c7a0681f706)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c33ca1696a0a967091937805fa198ffc3317a03f
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Thu Jul 9 21:19:15 2015 +0100

    configure.ac: do not set HAVE_DRI(23) when libdrm is missing
    
    These conditionals are used to guard both dri modules and loader(s).
    
    Currently if we try to build the gallium swrast dri module (without glx)
    on a system that's missing libdrm the build will fail.
    
    v2: Make sure we assign prior to checking the have_libdrm variable.
    
    Cc: 10.6 <mesa-stable at lists.freedesktop.org>
    Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
    (cherry picked from commit 16f6d432de07dcb537dafd0c9f3ef7614891ed6b)
    
    Conflicts:
    	configure.ac




More information about the mesa-commit mailing list