Mesa (master): 23 new commits

Thu Jul 23 07:26:35 UTC 2015

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=65d84daf29adb0da779e9b49291cb4e26f021e1e
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Jul 22 11:04:52 2015 +1000

    docs/GL3.txt: update ARB_shader_subroutine status.
    
    Acked-by: Kenneth Graunke <kenneth at whitecape.org>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c3fad009c54fb526d236fd10f4377ce7fbb54459
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Apr 20 10:30:53 2015 +1000

    st/mesa: enable shader subroutine
    
    since this touches drivers, only enable it on gallium
    for now for drivers reporting GLSL 1.30 or above.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a922c279930ec1ab34506ca2e24d8a62a297ea33
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Apr 20 10:29:42 2015 +1000

    st/mesa: add subroutine bits (v1.1)
    
    Just add support for the subroutine type to the
    glsl->tgsi convertor.
    
    v1.1: add subroutine to int support.
    
    Acked-by: Kenneth Graunke <kenneth at whitecape.org>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6f57fda494a6b4ccf30cab000ca28154fbabcb78
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Apr 20 10:29:12 2015 +1000

    mesa: fill out the ARB_shader_subroutine APIs
    
    This fleshes out the APIs, using the program resource
    APIs where they should match.
    
    It also sets the default values to valid subroutines.
    
    Acked-by: Kenneth Graunke <kenneth at whitecape.org>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3f4f3e2d4877e1e2bda064cc323fb7b3667e12fe
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Apr 20 10:28:40 2015 +1000

    program: add subroutine uniform support (v1.1)
    
    Add support for the subroutine uniform type ir->mesa.cpp
    
    v1.1: add subroutine to int to switch
    
    Acked-by: Kenneth Graunke <kenneth at whitecape.org>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0a18f160159b93c57943e5cb4d9d9a78a5b72996
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Apr 20 10:27:58 2015 +1000

    program_resource: add subroutine support (v3.1)
    
    This fleshes out the ARB_program_query support for the
    APIs that ARB_shader_subroutine introduces, leaving
    some TODOs for later addition.
    
    v2: reworked for lots of the ARB_program_interface_query
    entry points and tests
    v3: use common function to test for subroutine support
    v3.1: add tess, fix missing breaks
    
    Acked-by: Kenneth Graunke <kenneth at whitecape.org>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=60266863d80bb2af94fa5c189ccd23ee20607ea9
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Apr 20 10:27:36 2015 +1000

    glsl: add uniform and program resource support (v2)
    
    This adds linker support for subroutine uniforms, they
    have some subtle differences from real uniforms, we also hide
    them and they are given internal uniform names.
    
    This also adds the subroutine locations and subroutine uniforms
    to the program resource tracking for later use.
    
    v1.1: drop is_subroutine_def
    
    v2: handle explicit location properly, ARB_explicit_location
    has a lot of language for subroutine shaders.
    Calculate a link time the number of compatible subroutines
    for a uniform, to make program resource easier later.
    
    Acked-by: Kenneth Graunke <kenneth at whitecape.org>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=44ea8b9b8edc5f59da546683fe64129a1c1be449
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Jul 21 14:59:01 2015 +1000

    mesa/mtypes: add gl_subroutine_function and uniform storage to shader (v2)
    
    This adds the necessary storage for subroutine info to gl_shader.
    
    v2: add comments, rename one member
    Acked-by: Kenneth Graunke <kenneth at whitecape.org>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7dd429e8f74302d44af00d051e59911439152369
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Apr 23 13:34:14 2015 +1000

    glsl/ir: add subroutine lowering pass (v2.3)
    
    This lowers the enhanced ir_call using the lookaside table
    of subroutines into an if ladder. This initially was done
    at the AST level but it caused some ordering issues so a separate
    pass was required.
    
    v2: clone return value derefs.
    v2.1: update for subroutine->int convert.
    v2.2: add a clone for the array index
    
    Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=65ac360823ee12ac2d1f3bb6758d352fcd0d9210
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Jun 1 10:55:47 2015 +1000

    glsl: add ast/parser support for subroutine parsing storage (v3.2)
    
    This is the guts of the GLSL parser and AST support for
    shader subroutines.
    
    The code creates a subroutine type in the parser, and
    uses that there to validate the identifiers. The parser
    also distinguishes between subroutine types/function prototypes
    /uniforms and subroutine defintions for functions.
    
    Then in the AST conversion it recreates the types, and
    stores the subroutine definition info or subroutine info
    into the ir_function along with a side lookup table in
    the parser state. It also converts subroutine calls into
    the enhanced ir_call.
    
    v2: move to handling method calls in
    function handling not in field selection.
    v3: merge Chris's previous parser patches in here, to
    make it clearer what's changed in one place.
    v3.1: add more documentation, drop unused include
    v3.2: drop is_subroutine_def
    
    Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=884df9ef834d6b77226d0dfd778c5317365a2394
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Apr 24 10:47:03 2015 +1000

    glsl/ir: allow ir_call to handle subroutine calling
    
    This adds a ir_variable which contains the subroutine uniform
    and an array rvalue for the deref of that uniform, these
    are stored in the ir_call and lowered later.
    
    Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=30681c3bb80ad78392f1740aa915efa072c837e8
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Apr 20 10:22:57 2015 +1000

    glsl/ir: add subroutine information storage to ir_function (v1.1)
    
    We need to store two sets of info into the ir_function,
    if this is a function definition with a subroutine list
    (subroutine_def) or if it a subroutine prototype.
    
    v1.1: add some more documentation.
    
    Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d8a250ce5edc3da092ede6d62d433fbb37aa6cf6
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Jul 23 10:23:36 2015 +1000

    mesa: add function to check if shader subroutines are enabled.
    
    This checks if core profile and shader subroutine extension
    is enabled.
    
    Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=670b9e56da588581c90d6c68f0a55ecd9153504d
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Apr 20 10:20:06 2015 +1000

    mesa: add inline conversion functions for ARB_shader_subroutine (v2)
    
    This handles converting the shader stages to the internal
    prefix along with the program resource interfaces.
    
    v2: add tess support
    
    Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f73ef824869dbb1f91c32ad563c95ca917f40c12
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Jul 21 14:52:40 2015 +1000

    glsl: don't eliminate subroutine types.
    
    This stops dead code from removing subroutines types,
    we need these for the queries to work properly.
    
    Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=57f24299b7fe0f7b20c2a3cf1e94c747825b568d
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Apr 20 10:16:55 2015 +1000

    glsl/types: add new subroutine type (v3.2)
    
    This type will be used to store the name of subroutine types
    
    as in subroutine void myfunc(void);
    will store myfunc into a subroutine type.
    
    This is required to the parser can identify a subroutine
    type in a uniform decleration as a valid type, and also for
    looking up the type later.
    
    Also add contains_subroutine method.
    
    v2: handle subroutine to int comparisons, needed
    for lowering pass.
    v3: do subroutine to int with it's own IR
    operation to avoid hacking on asserts (Kayden)
    v3.1: fix warnings in this patch, fix nir,
    fix tgsi
    v3.2: fixup tests
    
    Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
    Signed-off-by: Dave Airlie <airlied at redhat.com>
    
    tests: fix warnings

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d16ff8ac783874c8ee74ef796b1c853829ff237d
Author: Chris Forbes <chrisf at ijw.co.nz>
Date:   Sun Aug 10 21:38:23 2014 +1200

    glsl: Make `subroutine` a reserved keyword
    
    Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
    Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
    Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=24b0e5068348aacabbd3e0012de95d34866e4b99
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Jul 23 10:49:12 2015 +1000

    dispatch_sanity: add shader subroutine to fix make check
    
    Add the shader subroutine to the core only API list,
    and fixup dispatch_sanity to suit.
    
    Acked-by: Kenneth Graunke <kenneth at whitecape.org>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cc172fddf3fc37991c6d85f2d8e4f6dc63a62809
Author: Chris Forbes <chrisf at ijw.co.nz>
Date:   Sun Aug 10 21:31:06 2014 +1200

    glsl: Add extension plumbing and define for ARB_shader_subroutine
    
    Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
    Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
    Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=25d6f56c08801909e784f81e9b9ced48977630f4
Author: Chris Forbes <chrisf at ijw.co.nz>
Date:   Sun Aug 10 21:07:33 2014 +1200

    mesa: Add glGet support for ARB_shader_subroutine implementation limits
    
    Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
    Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
    Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4c7b007104c63475ec080d0777a41603c78786f6
Author: Chris Forbes <chrisf at ijw.co.nz>
Date:   Sun Aug 10 20:43:45 2014 +1200

    mesa: Add extension tracking for arb_shader_subroutine (v2)
    
    v2: [airlied]: merge version check update.
    
    Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
    Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
    Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b8f3e316bca2c9abd3c885a9447ecf29446d0ccb
Author: Chris Forbes <chrisf at ijw.co.nz>
Date:   Sun Aug 10 20:38:53 2014 +1200

    glapi: Add ARB_shader_subroutine functions and enums (v2)
    
    v2: fix output="true" and LENGTH typo
    
    Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
    Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
    Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2ffe9b542116580571b157de8a89476b22694ea9
Author: Chris Forbes <chrisf at ijw.co.nz>
Date:   Sun Aug 10 21:00:34 2014 +1200

    mesa: Add stubs for ARB_shader_subroutine entrypoints
    
    Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
    Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
    Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
    Signed-off-by: Dave Airlie <airlied at redhat.com>