mesa: Changes to 'master'

Brian Paul brianp at kemper.freedesktop.org
Tue Jul 29 16:51:35 PDT 2008


The branch, master has been updated
        Commits at: http://cgit.freedesktop.org/mesa/mesa/log/?h=master

Summary of changes:
 docs/relnotes-7.1.html                            |    2 +-
 src/mesa/main/config.h                            |    1 +
 src/mesa/main/mtypes.h                            |    4 +-
 src/mesa/main/texstore.c                          |    6 +-
 src/mesa/main/varray.c                            |    5 -
 src/mesa/shader/arbprogram.c                      |  202 +++
 src/mesa/shader/arbprogram.h                      |   10 +
 src/mesa/shader/prog_execute.c                    |    2 +-
 src/mesa/shader/prog_parameter.c                  |   32 +-
 src/mesa/shader/prog_parameter.h                  |    2 +-
 src/mesa/shader/prog_print.c                      |    2 +-
 src/mesa/shader/prog_statevars.c                  |   10 +-
 src/mesa/shader/program.c                         |  209 +---
 src/mesa/shader/program.h                         |   18 -
 src/mesa/shader/shader_api.c                      |  242 +++-
 src/mesa/shader/slang/library/slang_120_core.gc   |   50 -
 src/mesa/shader/slang/library/slang_120_core_gc.h |   22 +-
 src/mesa/shader/slang/library/slang_core.gc       |   52 +-
 src/mesa/shader/slang/library/slang_core_gc.h     | 1598 ++++++++++----------
 src/mesa/shader/slang/library/slang_shader.syn    |   71 +-
 src/mesa/shader/slang/library/slang_shader_syn.h  |   29 +
 src/mesa/shader/slang/slang_builtin.c             |    4 +
 src/mesa/shader/slang/slang_codegen.c             |  690 ++++++++--
 src/mesa/shader/slang/slang_compile.c             |  211 +++-
 src/mesa/shader/slang/slang_compile_operation.c   |   31 +
 src/mesa/shader/slang/slang_compile_operation.h   |    5 +
 src/mesa/shader/slang/slang_compile_struct.c      |    4 +-
 src/mesa/shader/slang/slang_compile_struct.h      |   13 +-
 src/mesa/shader/slang/slang_compile_variable.c    |   22 +-
 src/mesa/shader/slang/slang_compile_variable.h    |    1 +
 src/mesa/shader/slang/slang_emit.c                |  380 +++--
 src/mesa/shader/slang/slang_emit.h                |    4 -
 src/mesa/shader/slang/slang_ir.c                  |   81 +-
 src/mesa/shader/slang/slang_ir.h                  |   20 +-
 src/mesa/shader/slang/slang_link.c                |   16 +-
 src/mesa/shader/slang/slang_preprocess.c          |   27 +
 src/mesa/shader/slang/slang_print.c               |   25 +-
 src/mesa/shader/slang/slang_simplify.c            |  239 ++--
 src/mesa/shader/slang/slang_simplify.h            |   28 +
 src/mesa/shader/slang/slang_typeinfo.c            |  100 +-
 src/mesa/shader/slang/slang_typeinfo.h            |    3 +-
 src/mesa/shader/slang/slang_vartable.c            |   33 +-
 42 files changed, 2782 insertions(+), 1724 deletions(-)

       via  b068ab62a0433b6a92374c83f153b3c9ac4b4e5e (commit)
       via  1bdb1345703584d9247c84f8efb9056db22de682 (commit)
       via  40f7e5f6749be3365a50d9a3931c03189b5352e7 (commit)
       via  ff916d718a461f9af96c89d3c19ec17adcbdaba5 (commit)
       via  016701f6860a840e079cb4c5f844a8cced712cd8 (commit)
       via  b26a80aa12f1f8316da495b4fdeb94e75ba5d740 (commit)
       via  a7dd701421082dbe6637f6b80a0707f14f69e007 (commit)
       via  6045f171381744fd8e703d978c3d188e30da4b94 (commit)
       via  a75015ef0301f3db4f3d5f86b6b2f85765f8465a (commit)
       via  1638edb3256b3b4bd8bc2eb65d02573601ef9a44 (commit)
       via  6225e51a73a51fa46d839a429f254d7786b1fd18 (commit)
       via  d9b6425e0004bf13e1ff9659e0b807d6d2911b70 (commit)
       via  91e1918f484b698016ca43bafdf4fddf2648cca5 (commit)
       via  6f1abb9c215583d11980294f7469da41ec14b7da (commit)
       via  1b465f287fd26d14797eca7c7a3f6cd339923e00 (commit)
       via  16dc993d4f01f6882933953115abc6ec7d93ba0b (commit)
       via  3d500f00d2a09becccd62abc0472090c4faa53d6 (commit)
       via  56bac7a35cf5763c28164224a45dae46e06aacbb (commit)
       via  5d9b33095ad6eff5ae55493629daac781897c55e (commit)
       via  d4c73c619a8d0db2f9662ab5cbdc15e854efce25 (commit)
       via  01c0558f70ead32db9b7da4ebdc2b33d2477c3e5 (commit)
       via  fb3422a241d7483c108f05290f966ffdbd219c3f (commit)
       via  7af8dddf2705cf0e2c02154615900bf49c8ee25a (commit)
       via  a9412ca2e89030897cd45747b70ebab6840c46b7 (commit)
       via  b36749d066bcba848d08937090492c33a277851d (commit)
       via  b7eea9a1ce9f3a28b74d77db19dcd859b6638a41 (commit)
       via  ff9b6a0ae2b38e9de717a688e823fd8b665d159a (commit)
       via  65db8c9518036bee7110befb4927f2995c7a125c (commit)
       via  19d44b95feaeb3d983a84827471f81afc079faf0 (commit)
       via  be50c481016ea9d01f97812ead5042618c05b37f (commit)
       via  bc985b5790bcbf2d19b2e42fee0807b1a3c9bc91 (commit)
       via  ffbc66bf614c5a2b9bc3a68a6fa7d027405a55b9 (commit)
       via  74a19b0abd382574ff583eab81a374acead9254d (commit)
       via  38a62ede6c68f292615ff8eaac749e12652dbdb9 (commit)
       via  378017417a7a0b7b8e25b6e859e9dcb92ef24ea9 (commit)
       via  f45ed0eb8d4d9cf01cf1d3d8b8d3f4fb774c4d48 (commit)
       via  5bfbcf7265dfc72d85f6adbf3b243355b16334d9 (commit)
       via  c3ad1761586c640ba7d4060c4a6917ce61078cf9 (commit)
       via  153407f72d3492f9d35e2424bb877def8b1a1dcd (commit)
       via  527e1357b59a476348b5fd2600fb99e85cc4e897 (commit)
      from  1a5c99f4b5ccbc71f3649092c723b5e295456314 (commit)


- Commits -----------------------------------------------
commit b068ab62a0433b6a92374c83f153b3c9ac4b4e5e
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Tue Jul 29 17:50:43 2008 -0600

    updated GLSL bug fixes

commit 1bdb1345703584d9247c84f8efb9056db22de682
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Tue Jul 29 17:49:38 2008 -0600

    mesa: glsl: remove old assertion (fixes glsl/bitmap.c)

commit 40f7e5f6749be3365a50d9a3931c03189b5352e7
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Tue Jul 29 17:47:52 2008 -0600

    mesa: disable debug code

commit ff916d718a461f9af96c89d3c19ec17adcbdaba5
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Tue Jul 29 17:45:46 2008 -0600

    mesa: regenerated files

commit 016701f6860a840e079cb4c5f844a8cced712cd8
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Tue Jul 29 17:43:35 2008 -0600

    mesa: Silence compiler warnings on Windows.

commit b26a80aa12f1f8316da495b4fdeb94e75ba5d740
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Tue Jul 29 17:37:55 2008 -0600

    mesa: cast to fix warning

commit a7dd701421082dbe6637f6b80a0707f14f69e007
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Tue Jul 29 17:37:13 2008 -0600

    mesa: fix bug/failure in recursive function inlining
    
    Fixes a failure for cases such as y = f(a, f(a, b))
    All the usual tests still pass but regressions are possible...

commit 6045f171381744fd8e703d978c3d188e30da4b94
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Tue Jul 29 17:33:52 2008 -0600

    mesa: glsl: silence warning (s/int/GLuint)

commit a75015ef0301f3db4f3d5f86b6b2f85765f8465a
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Tue Jul 29 17:32:35 2008 -0600

    mesa: remove stray debug code

commit 1638edb3256b3b4bd8bc2eb65d02573601ef9a44
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Tue Jul 29 17:29:30 2008 -0600

    mesa: glsl: assorted fixes for resolving polymorphic functions
    
    Plus,
    - fix some issues in casting function arguments to format param types.
    - fix some vec/mat constructor bugs
    - find/report more syntax/semantic errors

commit 6225e51a73a51fa46d839a429f254d7786b1fd18
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Fri Jul 25 14:48:36 2008 -0600

    mesa: glsl: re-order some constructors

commit d9b6425e0004bf13e1ff9659e0b807d6d2911b70
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Fri Jul 25 14:48:14 2008 -0600

    mesa: glsl: remove unneeded operators

commit 91e1918f484b698016ca43bafdf4fddf2648cca5
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Tue Jul 29 17:27:44 2008 -0600

    mesa: glsl: added null ptr check

commit 6f1abb9c215583d11980294f7469da41ec14b7da
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Tue Jul 29 17:27:22 2008 -0600

    mesa: fix issues causing warnings on Windows

commit 1b465f287fd26d14797eca7c7a3f6cd339923e00
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Thu Jul 24 17:49:33 2008 -0600

    mesa: glsl: additional error detection
    
    Plus begin some fixes for vec/matrix constructors.

commit 16dc993d4f01f6882933953115abc6ec7d93ba0b
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Thu Jul 24 15:49:09 2008 -0600

    mesa: gls: fix broken else clause of conditional break/continue
    
    In the following case:
    
       for () {
          if (cond)
             break;  // or continue;
          else
             something;
       }
    
    The "something" block didn't get emitted.

commit 3d500f00d2a09becccd62abc0472090c4faa53d6
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Thu Jul 24 14:56:54 2008 -0600

    mesa: glsl: only try to link shaders defining main()

commit 56bac7a35cf5763c28164224a45dae46e06aacbb
Author: Michal Krol <michal at tungstengraphics.com>
Date:   Thu Jul 24 11:03:05 2008 +0200

    mesa: Silence compiler warning on windows.

commit 5d9b33095ad6eff5ae55493629daac781897c55e
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Wed Jul 23 15:04:25 2008 -0600

    mesa: glsl: fix/simplify array element handling
    
    Also fix bug in comparing large structs/arrays.

commit d4c73c619a8d0db2f9662ab5cbdc15e854efce25
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Wed Jul 23 12:00:48 2008 -0600

    mesa: glsl: mark constructor params as const

commit 01c0558f70ead32db9b7da4ebdc2b33d2477c3e5
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Tue Jul 22 18:27:56 2008 -0600

    mesa: glsl: rework swizzle storage handling
    
    Build on the heirarchal approach implemented for arrays/structs.

commit fb3422a241d7483c108f05290f966ffdbd219c3f
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Tue Jul 22 17:38:55 2008 -0600

    mesa: fix uninitialized var

commit 7af8dddf2705cf0e2c02154615900bf49c8ee25a
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Tue Jul 22 15:17:10 2008 -0600

    mesa: glsl: implement constructor functions for user-defined types

commit a9412ca2e89030897cd45747b70ebab6840c46b7
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Tue Jul 22 11:54:22 2008 -0600

    mesa: remove stray debug assertion

commit b36749d066bcba848d08937090492c33a277851d
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Mon Jul 21 20:42:05 2008 -0600

    mesa: fix glUniform error checking for samplers

commit b7eea9a1ce9f3a28b74d77db19dcd859b6638a41
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Tue Jul 29 17:19:25 2008 -0600

    mesa: refactor: move _mesa_Bind/Gen/DeleteProgram() to arbprogram.c
    
    No API-level functions now in program.c.

commit ff9b6a0ae2b38e9de717a688e823fd8b665d159a
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Mon Jul 21 17:18:22 2008 -0600

    mesa: initial support for GLSL struct/array comparisons

commit 65db8c9518036bee7110befb4927f2995c7a125c
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Mon Jul 21 16:04:56 2008 -0600

    mesa: added null ptr check (error handling case)

commit 19d44b95feaeb3d983a84827471f81afc079faf0
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Mon Jul 21 16:04:24 2008 -0600

    mesa: fix +=, -=, etc. operators

commit be50c481016ea9d01f97812ead5042618c05b37f
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Mon Jul 21 14:23:33 2008 -0600

    mesa: remove an error check for NV_v_p that doesn't apply to ARB_v_p

commit bc985b5790bcbf2d19b2e42fee0807b1a3c9bc91
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Mon Jul 21 14:16:07 2008 -0600

    mesa: fix some issues in _mesa_validate_program()

commit ffbc66bf614c5a2b9bc3a68a6fa7d027405a55b9
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Mon Jul 21 13:58:50 2008 -0600

    mesa: assorted glsl uniform/attribute fixes
    
    Fix incorrect uniform/attribute size query results.
    Add missing error checking for glUniform, glUniformMatrix params
    Fix an array size/allocation error.

commit 74a19b0abd382574ff583eab81a374acead9254d
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Fri Jul 18 19:46:19 2008 -0600

    mesa: glsl: various writemask/swizzle improvements and clean-ups

commit 38a62ede6c68f292615ff8eaac749e12652dbdb9
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Tue Jul 29 17:15:08 2008 -0600

    mesa: rework array/struct addressing code.
    
    The slang_ir_storage type now has a pointer to parent storage to represent
    storage of an array element within an array, or a field within a struct.
    This fixes some problems related to addressing of fields/elements in non-
    trivial cases.  More work to follow.

commit 378017417a7a0b7b8e25b6e859e9dcb92ef24ea9
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Fri Jul 18 12:52:24 2008 -0600

    mesa: fix some GLSL /= int operators
    
    plus add a few more special constructors to improve code quality.

commit f45ed0eb8d4d9cf01cf1d3d8b8d3f4fb774c4d48
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Fri Jul 18 12:51:39 2008 -0600

    mesa: fix set_program_uniform_matrix(): need to loop over matrix count

commit 5bfbcf7265dfc72d85f6adbf3b243355b16334d9
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Tue Jul 29 17:12:19 2008 -0600

    mesa: implement grammar/parsing for precision/invariant syntax
    
    Plus, fix some issues with pre-defined preprocessor symbols and version checking.

commit c3ad1761586c640ba7d4060c4a6917ce61078cf9
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Tue Jul 29 17:09:40 2008 -0600

    mesa: Silence compiler warnings on Windows.

commit 153407f72d3492f9d35e2424bb877def8b1a1dcd
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Tue Jul 29 17:05:54 2008 -0600

    mesa: fix some function inlining bugs
    
    Need to add local vars of original function to the new scope's variable
    list (though the DECLs were already present).
    In slang_operation_copy() call slang_replace_scope() for SLANG_OPER_BLOCK_NEW_SCOPE opers.

commit 527e1357b59a476348b5fd2600fb99e85cc4e897
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Tue Jul 29 17:04:53 2008 -0600

    mesa: improved printing

---------------------------------



More information about the mesa-commit mailing list