mesa: Changes to 'master'

[Brian Paul]

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

Summary of changes:
 src/mesa/shader/arbprogparse.c        |    5 +++-
 src/mesa/shader/prog_execute.c        |    2 -
 src/mesa/shader/program.c             |   23 +++++++++++++-------
 src/mesa/shader/shader_api.c          |   38 +++++++++++++-------------------
 src/mesa/shader/slang/slang_codegen.c |    2 +-
 src/mesa/shader/slang/slang_link.c    |   32 ++++++++-------------------
 src/mesa/tnl/t_vp_build.c             |    3 +-
 7 files changed, 48 insertions(+), 57 deletions(-)

       via  f27c6f313955b737888ce80752ee9cd895562d40 (commit)
       via  f2632212ad7735c659331b65d3bfe14aef0faccb (commit)
       via  e291cf6f8d3423c2f1e123ec2a42f0568019da80 (commit)
       via  8bdf5b6e6465ff734a798efb193ab16cd33df36e (commit)
       via  a3e86d43e6c99af97c2931c883d552c9714006e8 (commit)
       via  eb4271ea8b29cff87f33d3ed9aee43d59986d2d9 (commit)
       via  6de6999edc41ed5cb8840bfb3265d025b2cbdfe7 (commit)
       via  1af2b14514146d5f0d48a45165a579e88cc7a867 (commit)
       via  885cc592dfcc3b46e1896d243f60c38cf18fa54b (commit)
      from  e6cd9d88d345b998f8623f0f92c3c4cea8e66f54 (commit)


- Commits -----------------------------------------------
commit f27c6f313955b737888ce80752ee9cd895562d40
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Fri May 16 15:17:35 2008 -0600

    fix merge collision

commit f2632212ad7735c659331b65d3bfe14aef0faccb
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Fri May 16 10:49:44 2008 -0600

    silence warning, new assertion

commit e291cf6f8d3423c2f1e123ec2a42f0568019da80
Author: Shunichi Fuji <palglowr at gmail.com>
Date:   Fri May 16 10:11:25 2008 -0600

    free(key) in _tnl_UpdateFixedFunctionProgram()

commit 8bdf5b6e6465ff734a798efb193ab16cd33df36e
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Fri May 16 09:56:59 2008 -0600

    Fix a program refcounting error, don't share program parameter lists.
    
    The refcounting bug was causing a memleak (unfreed programs).
    The old parameter list sharing is not needed since the change in how
    uniforms are handled.

commit a3e86d43e6c99af97c2931c883d552c9714006e8
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Fri May 16 09:56:11 2008 -0600

    minor changes to aid debugging

commit eb4271ea8b29cff87f33d3ed9aee43d59986d2d9
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Fri May 16 09:38:33 2008 -0600

    remove stray, left-over RefCount++

commit 6de6999edc41ed5cb8840bfb3265d025b2cbdfe7
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Wed May 14 19:14:10 2008 -0600

    whitespace/formatting

commit 1af2b14514146d5f0d48a45165a579e88cc7a867
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Wed May 14 16:44:48 2008 -0600

    init SamplersUsed bits in _mesa_parse_arb_fragment_program

commit 885cc592dfcc3b46e1896d243f60c38cf18fa54b
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Wed May 14 16:23:46 2008 -0600

    fix assertion typo: s/=/==/

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