mesa: Changes to 'master'

Nicolai Hähnle nh at kemper.freedesktop.org
Sat Jun 14 02:18:08 UTC 2008


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

Summary of changes:
 src/mesa/drivers/dri/r300/Makefile                 |    2 +
 src/mesa/drivers/dri/r300/r300_context.c           |    2 +
 src/mesa/drivers/dri/r300/r300_context.h           |   51 +-
 src/mesa/drivers/dri/r300/r300_fragprog.c          | 2478 +++-----------------
 src/mesa/drivers/dri/r300/r300_fragprog.h          |   46 +-
 .../r300/{r300_fragprog.c => r300_fragprog_emit.c} | 1713 +++++---------
 src/mesa/drivers/dri/r300/r300_ioctl.c             |    1 +
 src/mesa/drivers/dri/r300/r300_render.c            |    1 +
 src/mesa/drivers/dri/r300/r300_shader.c            |    1 -
 src/mesa/drivers/dri/r300/r300_state.c             |   74 +-
 src/mesa/drivers/dri/r300/radeon_program.c         |  281 +++
 src/mesa/drivers/dri/r300/radeon_program.h         |  164 ++
 src/mesa/main/texenvprogram.c                      |    8 +-
 13 files changed, 1501 insertions(+), 3321 deletions(-)
 copy src/mesa/drivers/dri/r300/{r300_fragprog.c => r300_fragprog_emit.c} (54%)
 create mode 100644 src/mesa/drivers/dri/r300/radeon_program.c
 create mode 100644 src/mesa/drivers/dri/r300/radeon_program.h

       via  a1c0c56d70308a562c90cc01982c89ed1396c830 (commit)
       via  83ad2a756ea8dd1b0ca9746e355ce3de0f29356e (commit)
       via  2882e5162525138316db9a1ab539a17498d06da1 (commit)
       via  e34dc8227c1fa8bc9ffcd311de701053a633a7ec (commit)
       via  b5170bc9d32530ec93dae4b543d3552e83d6b4a1 (commit)
       via  e2aa45c2f9584ff76151a99b4fcd0ecb56260473 (commit)
       via  caeabb1ebea33828e956efed19dce46767a068b4 (commit)
       via  4ba1c7d84826aaa07114872560cab3a428949499 (commit)
       via  defadd9c03c726d1e79bd911de07a2682bf78b01 (commit)
      from  b7669e4a8637a9680bcef0d0db82ae5e1984741c (commit)


- Commits -----------------------------------------------
commit a1c0c56d70308a562c90cc01982c89ed1396c830
Author: Nicolai Haehnle <nhaehnle at gmail.com>
Date:   Sat Jun 14 04:07:51 2008 +0200

    r300: Implement GL_ARB_shadow and GL_EXT_shadow_funcs

commit 83ad2a756ea8dd1b0ca9746e355ce3de0f29356e
Author: Nicolai Haehnle <nhaehnle at gmail.com>
Date:   Sat Jun 14 02:28:58 2008 +0200

    texenvprogram: Mark textures using ARB_shadow as ShadowSamplers
    
    Since ARB_fragment_program and friends are defined to ignore the setting of
    the GL_TEXTURE_COMPARE_FUNC parameter, we have to explicitly enable the
    shadow comparison by marking the texture unit in ShadowSamplers when
    appropriate.

commit 2882e5162525138316db9a1ab539a17498d06da1
Author: Nicolai Haehnle <nhaehnle at gmail.com>
Date:   Sat Jun 14 03:34:09 2008 +0200

    r300: Add radeonCompilerDump for debugging

commit e34dc8227c1fa8bc9ffcd311de701053a633a7ec
Author: Nicolai Haehnle <nhaehnle at gmail.com>
Date:   Sat Jun 14 01:46:19 2008 +0200

    r300_fragprog: Refactor TEX transformation
    
    Streamlining source and destination registers, as well as texcoord scaling for
    RECT textures is now done in a radeon_program based transformation.
    
    The idea is that this will allow us to optimize away unnecessary indirections
    more easily.

commit b5170bc9d32530ec93dae4b543d3552e83d6b4a1
Author: Nicolai Haehnle <nhaehnle at gmail.com>
Date:   Fri Jun 13 23:46:04 2008 +0200

    r300: Add radeon_program and trivial refactoring of r300_fragprog to use it
    
    The idea/hope is that radeon_program will serve as an intermediate
    representation for r3xx up to r6xx fragment and vertex programs.
    Right now, it is nothing more than a simplistic wrapper around Mesa's
    prog_instruction, together with the notion of clauses, taken from r6xx docs.
    
    The clauses will eventually be used to represent the nodes that are used in
    r300 family fragment programs.

commit e2aa45c2f9584ff76151a99b4fcd0ecb56260473
Author: Nicolai Haehnle <nhaehnle at gmail.com>
Date:   Fri Jun 13 22:09:37 2008 +0200

    r300: Do not include r300_fragprog.h from r300_context.h and other cleanups

commit caeabb1ebea33828e956efed19dce46767a068b4
Author: Nicolai Haehnle <nhaehnle at gmail.com>
Date:   Fri Jun 13 22:03:26 2008 +0200

    r300_fragprog: Remove dead declarations, move NOP declarations into source

commit 4ba1c7d84826aaa07114872560cab3a428949499
Author: Nicolai Haehnle <nhaehnle at gmail.com>
Date:   Fri Jun 13 21:43:09 2008 +0200

    r300_fragprog: Refactoring and cleanup
    
    Refactor so that r300_pfs_compile_state "owns"/holds a pointer to
    r300_fragment_program instead of the other way round. This is more natural from
    an object orientation point of view.
    
    Move the compiled hardware state into r300_fragment_program_code, in
    anticipation of on-the-fly program recompilation based on external OpenGL
    state.

commit defadd9c03c726d1e79bd911de07a2682bf78b01
Author: Nicolai Haehnle <nhaehnle at gmail.com>
Date:   Fri Jun 13 20:03:17 2008 +0200

    r300_fragprog: Remove dead code

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




More information about the mesa-commit mailing list