mesa: Changes to 'gallium-tex-surfaces'

Keith Whitwell keithw at kemper.freedesktop.org
Tue May 6 06:45:49 UTC 2008


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

Summary of changes:
 progs/tests/manytex.c                        |    1 +
 progs/tests/mipmap_limits.c                  |   32 +++-
 src/gallium/auxiliary/tgsi/exec/tgsi_exec.c  |    6 +
 src/gallium/auxiliary/tgsi/exec/tgsi_exec.h  |   10 +-
 src/gallium/auxiliary/tgsi/exec/tgsi_sse2.c  |   65 +++----
 src/gallium/auxiliary/util/u_gen_mipmap.c    |   20 +-
 src/gallium/drivers/softpipe/sp_tex_sample.c |   14 ++
 src/gallium/drivers/softpipe/sp_tile_cache.c |   12 +-
 src/gallium/include/pipe/p_defines.h         |    2 +-
 src/gallium/winsys/xlib/xm_winsys.c          |  260 +++++++++++++-------------
 src/mesa/main/imports.c                      |   36 ++--
 src/mesa/state_tracker/st_atom.h             |   28 ++--
 src/mesa/state_tracker/st_atom_sampler.c     |    4 +-
 src/mesa/state_tracker/st_atom_texture.c     |    2 +
 src/mesa/state_tracker/st_cb_strings.c       |   12 +-
 src/mesa/state_tracker/st_cb_texture.c       |   30 +--
 src/mesa/state_tracker/st_texture.h          |    4 +-
 17 files changed, 283 insertions(+), 255 deletions(-)

       via  09e6be9b5782870f1f225653687e0d3e7be2a5a9 (commit)
       via  f77442fbd3b539aa3da927630c12c3a1a377f6da (commit)
       via  736374c1052be647bd7c377344acf8db0af4ddfc (commit)
       via  736f535b4f1c5e6912b5b2fe9415a3b44a678844 (commit)
       via  bc57a7c9f7e5f70d77e7f02da2a214a56fad1d80 (commit)
       via  3837d401cc665eccf079eba5822b1a3eec565b81 (commit)
       via  3668d20a9f382a174e002dc9b226710bdd983992 (commit)
       via  6e004e973bcc5b789ee3f70b70f5d728c8b8ea71 (commit)
       via  07aaf3a7a730d65052ec34a82cce9b373673b556 (commit)
       via  ce509401738e7073de94a2b7fc41461c52a73da0 (commit)
       via  479d19f5a2bca79104f3b7f94147e94a52a27fea (commit)
       via  3d53d38d5e35386de4793162b9dd32e171927059 (commit)
       via  cc2af38f2afa0e6003c8338d51c4f5fbabde40e1 (commit)
       via  cff8d3bdcbf78b57b52a2f60c54e5a3cae286137 (commit)
       via  e9513bd403c0ba0b004d2414fda6736b38cecfd5 (commit)
       via  522f11b63279da6bc487f5b6fd71ecbba7aead52 (commit)
       via  8a5bf456dcb84b315152b87e33c8736248ad0a46 (commit)
       via  d4074c509b5d28be0a2ec51d40329e1aed7047ef (commit)
       via  be8a42b4fcad0e0c7803e63f9c4b488c2f618cef (commit)
       via  6c15a70b75b1625b69790f98f2f44e9ae4435f6a (commit)
       via  17058e07469f2dc5b47b4f820bd5a31b7ed9177c (commit)
      from  6361d6f48d13ce481253faf106fba5c6a41488ed (commit)


- Commits -----------------------------------------------
commit 09e6be9b5782870f1f225653687e0d3e7be2a5a9
Merge: 6361d6f48d13ce481253faf106fba5c6a41488ed f77442fbd3b539aa3da927630c12c3a1a377f6da
Author: Keith Whitwell <keith at tungstengraphics.com>
Date:   Tue May 6 07:45:28 2008 +0100

    Merge commit 'origin/gallium-0.1' into gallium-tex-surfaces
    
    Conflicts:
    
    	src/mesa/state_tracker/st_atom_sampler.c
    	src/mesa/state_tracker/st_cb_texture.c

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




More information about the mesa-commit mailing list