Mesa (7.9): 21 new commits

Thu Sep 23 16:15:33 UTC 2010

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=97cfa1240cafe2a119ba1fcd2a0aab3087b309f7
Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Wed Sep 22 11:01:11 2010 -0400

    intel: Fix GL_ARB_shading_language_120 commit
    
    Fix commit e7087175f8a04f777403366fb34b58edd00f4d60.  Move the reference to
    GL_VERSION_2_1_functions to intel_extensions.c where it's available,
    don't try to enable a non-existing extension and advertise 1.20 for all
    intel chipsets, not just GEN4 and up.
    (cherry picked from commit b91dba49e0b08b18dbd6c477facdcc7b5472c8c7)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6b0c28066039e895932f096c6528de042afbe192
Author: Brian Paul <brianp at vmware.com>
Date:   Tue Sep 21 18:13:02 2010 -0600

    mesa: don't advertise bogus GL_ARB_shading_language_120 extension
    
    Instead of using the invalid GL_ARB_shading_language_120 extension to
    determine the GLSL version, use a new ctx->Const.GLSLVersion field.
    Updated the intel and r600 drivers, but untested.
    
    See fd.o bug 29910
    
    NOTE: This is a candidate for the 7.9 branch (but let's wait and see if
    there's any regressions).
    (cherry picked from commit e7087175f8a04f777403366fb34b58edd00f4d60)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b437c9102f6a96e0ca4de75000c772c63fc85f0f
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Sep 21 10:35:50 2010 -0700

    i965: Share the KIL_NV implementation between glsl and non-glsl.
    (cherry picked from commit 23c507f1358833585de330ed313dffafabbbd3cd)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4ec818ea4aeb79c1a52a92f88189ab7a676299ff
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Sun Sep 19 04:51:07 2010 +0200

    glsl: Fix broken handling of ir_binop_equal and ir_binop_nequal.
    
    When ir_binop_all_equal and ir_binop_any_nequal were introduced, the
    meaning of these two opcodes changed to return vectors rather than a
    single scalar, but the constant expression handling code was incorrectly
    written and only worked for scalars.  As a result, only the first
    component of the returned vector would be properly initialized.
    (cherry picked from commit 6ea16b6c510ee7f0e68505838a99562f0852f8e4)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=80a6cbfea326e8a9332b89f20ca9a87ac52608b0
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Sun Sep 19 04:50:28 2010 +0200

    glsl: Add comments to clarify the types of comparison binops.
    (cherry picked from commit 14eea268284491d64ff92b37723bff1e9ff14b40)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec2031563a7ead76ae0b9710a8736c4e9d40f42d
Author: Brian Paul <brianp at vmware.com>
Date:   Mon Sep 20 08:22:51 2010 -0600

    glsl2: silence compiler warnings in printf() calls
    
    Such as: "ir_validate.cpp:143: warning: format ‘%p’ expects type ‘void*’,
    but argument 2 has type ‘ir_variable*’"
    (cherry picked from commit 17391241599137b9729e9ee6c5487d05e04d8aee)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b7d4f08f4ef92116ba228b53b27ea2e3456b894e
Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Sat Sep 18 16:08:38 2010 +0200

    glsl: Add doxygen comments
    (cherry picked from commit e053d62aa573651abdd78666d299272c8219a3aa)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2fc2b896809907f920a16bbea29527ab6fea2ee5
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Sat Sep 18 15:56:28 2010 +0200

    glsl/builtins: Switch comparison functions to just return an expression.
    (cherry picked from commit dbd24805071332a06828bd92ed0f6e49c897c146)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b29289a61cec88a67541dc7e3bf3fcfba27e38ef
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Sat Sep 18 14:44:18 2010 +0200

    glsl/builtins: Fix equal and notEqual builtins.
    
    Commit 309cd4115b7cba669a0bf858e7809cb6dae90ddf incorrectly converted
    these to all_equal and any_nequal, which is the wrong operation.
    (cherry picked from commit 52f9156e88d87a528996f01795203feba3f789f1)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=728829ab63209afcf5886bed47f8c95c3f045125
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Sat Sep 18 11:11:09 2010 +0200

    glsl: Properly handle nested structure types.
    
    Fixes piglit test CorrectFull.frag.
    (cherry picked from commit ca92ae2699c4aad21c0811b9a5562b9223816caf)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9753ee3f3ec33cece9121e6eee11136fccf26c4e
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date:   Sat Sep 18 01:56:34 2010 +0200

    glsl2: Fixed cloning of ir_call error instructions.
    
    Those have the callee field set to the null pointer, so
    calling the public constructor will segfault.
    
    Signed-off-by: Tilman Sauerbeck <tilman at code-monkey.de>
    (cherry picked from commit 3894fddccc3a6da91513b49142a8f0dbbf8aa448)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2db539844920f48ae83f145903a56d6debced4e8
Author: Vinson Lee <vlee at vmware.com>
Date:   Sat Sep 18 00:14:20 2010 -0700

    glsl: Fix 'control reaches end of non-void function' warning.
    
    Fixes this GCC warning.
    
    lower_variable_index_to_cond_assign.cpp:
    In member function
    'bool variable_index_to_cond_assign_visitor::needs_lowering(ir_dereference_array*) const':
    
    lower_variable_index_to_cond_assign.cpp:261:
    warning: control reaches end of non-void function
    (cherry picked from commit a822ae3f1a14ddd00a6368d767213ea42d00e7fb)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ee8a96707ac88d04d987b1d1b778e439079714be
Author: Vinson Lee <vlee at vmware.com>
Date:   Fri Sep 17 23:35:09 2010 -0700

    ir_to_mesa: Remove unused member array_indexed from struct statevar_element.
    
    Fixes this GCC warning.
    warning: missing initializer for member 'statevar_element::array_indexed'
    (cherry picked from commit ff78d6dcc07c0951cddc72e76cad355239a43c73)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=22dcee8da28172efa28516db9c87556dd63c3ec4
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date:   Fri Sep 17 18:50:07 2010 +0200

    glsl2: Empty functions can be inlined.
    
    Signed-off-by: Tilman Sauerbeck <tilman at code-monkey.de>
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    (cherry picked from commit 19f8f32a967fbe376ca0aae9be12100f4cdf9d31)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b622bfbee6b1ccf889b9843e2535b07345eb6dd
Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Thu Sep 16 14:40:26 2010 +0200

    glsl2: Add flags to enable variable index lowering
    (cherry picked from commit a6ecd1c3724a78b76ab9e81ea39632f1279021f8)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2bb2efd7b24e74866912e5a477a35a3e6ed6ba86
Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Thu Sep 16 12:12:22 2010 +0200

    glsl2: Refactor testing for whether a deref is of a matrix or array
    (cherry picked from commit 6e4fe39da26bf101f5fe1103ba426c0903445352)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a19f0fb50bb2dfcbcce2ae0e00cec409ef71b27f
Author: Luca Barbieri <luca at luca-barbieri.com>
Date:   Wed Sep 8 01:35:44 2010 +0200

    glsl: add pass to lower variable array indexing to conditional assignments
    
    Currenly GLSL happily generates indirect addressing of any kind of
    arrays.
    
    Unfortunately DirectX 9 GPUs are not guaranteed to support any of them in
    general.
    
    This pass fixes that by lowering such constructs to a binary search on the
    values, followed at the end by vectorized generation of equality masks, and
    4 conditional assignments for each mask generation.
    
    Note that this requires the ir_binop_equal change so that we can emit SEQ
    to generate the boolean masks.
    
    Unfortunately, ir_structure_splitting is too dumb to turn the resulting
    constant array references to individual variables, so this will need to
    be added too before this pass can actually be effective for temps.
    
    Several patches in the glsl2-lower-variable-indexing were squashed
    into this commit.  These patches fix bugs in Luca's original
    implementation, and the individual patches can be seen in that branch.
    This was done to aid bisecting in the future.
    
    Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
    (cherry picked from commit a47539c7a155475de00fa812842721d239abb3f4)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8df8bb43c7c2aee672fc000b122fdc9cee8972b6
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Thu Sep 16 02:55:02 2010 -0700

    glsl: Don't print blank (function ...) headers for built-ins.
    
    Fixes a regression caused when I added my GLSL ES support.
    (cherry picked from commit 8fbe968a62f845da2a1491c398acf0b2140d2372)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d2b6502c93b0501b838db5332e18b8cfee781488
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Thu Sep 16 02:52:25 2010 -0700

    glsl: Change from has_builtin_signature to has_user_signature.
    
    The print visitor needs this, and the only existing user can work with
    has_user_signature just as well.
    (cherry picked from commit 81f03393982c29f8f4165b5629c8e8fb708b97a3)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e68ec2212f4e2b78ea9815a9ec997a761df63665
Author: Brian Paul <brianp at vmware.com>
Date:   Wed Sep 15 12:47:32 2010 -0600

    glsl2: fix signed/unsigned comparison warning
    (cherry picked from commit 7545514fb65f807fa2c888954f0ac153a918e2ce)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c0f82e619c02e5de688054b3eaa76b1fbf9ae334
Author: Vinson Lee <vlee at vmware.com>
Date:   Wed Sep 15 05:17:57 2010 -0700

    glsl: Fix 'format not a string literal and no format arguments' warning.
    
    Fix the following GCC warning.
    loop_controls.cpp: In function 'int calculate_iterations(ir_rvalue*, ir_rvalue*, ir_rvalue*, ir_expression_operation)':
    loop_controls.cpp:88: warning: format not a string literal and no format arguments
    (cherry picked from commit f20f2cc3306310f6fc4c338f91cfac10f98335d3)