mesa: Changes to 'gallium-0.2'

Keith Whitwell keithw at kemper.freedesktop.org
Thu Sep 11 17:34:12 UTC 2008


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

Summary of changes:
 Makefile                                           |    1 +
 SConstruct                                         |    2 +
 configs/default                                    |    4 +
 configs/linux-cell                                 |   14 +-
 configs/linux-cell-debug                           |   10 +
 include/GLES/gl.h                                  |    1 -
 include/GLES/glext.h                               |    1 -
 include/GLES/glplatform.h                          |    1 -
 include/GLES2/gl2.h                                |    1 -
 include/GLES2/gl2ext.h                             |    1 -
 include/GLES2/gl2platform.h                        |    1 -
 progs/demos/Makefile                               |   28 +-
 progs/glsl/Makefile                                |    9 +-
 progs/redbook/Makefile                             |    2 +-
 progs/samples/Makefile                             |    8 +-
 progs/tests/Makefile                               |   41 +-
 progs/tests/quads.c                                |  258 ++++++
 progs/trivial/Makefile                             |   17 +-
 progs/trivial/long-fixed-func.c                    |  151 ++++
 progs/trivial/tri-z.c                              |   45 +-
 progs/xdemos/Makefile                              |   30 +-
 scons/gallium.py                                   |   34 +-
 src/egl/drivers/xdri/egl_xdri.c                    |  264 ++++++-
 src/egl/main/eglsurface.c                          |   75 ++-
 src/egl/main/eglsurface.h                          |    1 +
 src/gallium/auxiliary/draw/draw_pt_vcache.c        |  149 ++--
 src/gallium/auxiliary/draw/draw_vs_aos.c           |   11 +
 src/gallium/auxiliary/draw/draw_vs_aos.h           |   10 +-
 src/gallium/auxiliary/draw/draw_vs_aos_io.c        |    4 +
 .../auxiliary/pipebuffer/pb_buffer_fenced.c        |   24 +-
 src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c |   38 +-
 src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c |   77 ++-
 src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c    |   20 +-
 src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c  |   24 +-
 src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c  |  124 ++-
 src/gallium/auxiliary/rtasm/rtasm_execmem.c        |   11 +-
 src/gallium/auxiliary/rtasm/rtasm_ppc_spe.c        |  124 +++-
 src/gallium/auxiliary/rtasm/rtasm_ppc_spe.h        |   52 +-
 src/gallium/auxiliary/rtasm/rtasm_x86sse.c         |    2 +-
 src/gallium/auxiliary/tgsi/tgsi_dump.c             |  160 ++--
 src/gallium/auxiliary/tgsi/tgsi_exec.c             |    1 +
 src/gallium/auxiliary/tgsi/tgsi_sanity.c           |    2 +-
 src/gallium/auxiliary/tgsi/tgsi_sse2.c             |   87 +--
 .../auxiliary/translate/translate_generic.c        |    6 +
 src/gallium/auxiliary/util/Makefile                |    5 +-
 src/gallium/auxiliary/util/SConscript              |    2 +
 src/gallium/auxiliary/util/p_debug.c               |  111 +++-
 src/gallium/auxiliary/util/u_blit.c                |   22 +-
 src/gallium/auxiliary/util/u_draw_quad.c           |   12 +-
 src/gallium/auxiliary/util/u_gen_mipmap.c          |   42 +-
 src/gallium/auxiliary/util/u_memory.h              |   13 +-
 src/gallium/auxiliary/util/u_pack_color.h          |  155 ++++
 src/gallium/auxiliary/util/u_rect.c                |  178 ++++
 src/gallium/auxiliary/util/u_rect.h                |   18 +
 src/gallium/auxiliary/util/u_stream.h              |   61 ++
 src/gallium/auxiliary/util/u_stream_stdc.c         |  106 +++
 src/gallium/auxiliary/util/u_stream_wd.c           |  224 +++++
 src/gallium/auxiliary/util/u_time.c                |   20 +
 src/gallium/auxiliary/util/u_time.h                |    3 +
 src/gallium/auxiliary/util/u_timed_winsys.c        |  346 ++++++++
 src/gallium/auxiliary/util/u_timed_winsys.h        |   41 +
 src/gallium/drivers/cell/common.h                  |   43 +-
 src/gallium/drivers/cell/ppu/Makefile              |    4 +-
 src/gallium/drivers/cell/ppu/cell_batch.c          |   56 ++-
 src/gallium/drivers/cell/ppu/cell_batch.h          |    3 +
 src/gallium/drivers/cell/ppu/cell_clear.c          |   30 +
 src/gallium/drivers/cell/ppu/cell_context.c        |   44 +-
 src/gallium/drivers/cell/ppu/cell_context.h        |   29 +-
 src/gallium/drivers/cell/ppu/cell_draw_arrays.c    |   42 +-
 src/gallium/drivers/cell/ppu/cell_draw_arrays.h    |   20 +-
 src/gallium/drivers/cell/ppu/cell_flush.c          |   14 +-
 src/gallium/drivers/cell/ppu/cell_flush.h          |    2 +-
 src/gallium/drivers/cell/ppu/cell_gen_fragment.c   |  862 ++++++++++++++++++++
 src/gallium/drivers/cell/ppu/cell_gen_fragment.h   |   38 +
 src/gallium/drivers/cell/ppu/cell_pipe_state.c     |   23 +-
 src/gallium/drivers/cell/ppu/cell_spu.c            |   28 +-
 src/gallium/drivers/cell/ppu/cell_state.h          |   16 +-
 src/gallium/drivers/cell/ppu/cell_state_derived.c  |   29 +-
 src/gallium/drivers/cell/ppu/cell_state_emit.c     |   89 +--
 .../drivers/cell/ppu/cell_state_per_fragment.c     |   30 +-
 src/gallium/drivers/cell/ppu/cell_state_shader.c   |   26 +-
 src/gallium/drivers/cell/ppu/cell_state_vertex.c   |   12 +-
 src/gallium/drivers/cell/ppu/cell_surface.c        |   99 +---
 src/gallium/drivers/cell/ppu/cell_texture.c        |   84 ++-
 src/gallium/drivers/cell/ppu/cell_vbuf.c           |   12 +-
 src/gallium/drivers/cell/ppu/cell_vertex_fetch.c   |    5 +-
 src/gallium/drivers/cell/ppu/cell_vertex_shader.c  |    2 +-
 src/gallium/drivers/cell/spu/Makefile              |    9 +-
 src/gallium/drivers/cell/spu/spu_colorpack.h       |    6 +-
 src/gallium/drivers/cell/spu/spu_exec.c            |  150 ++--
 src/gallium/drivers/cell/spu/spu_main.c            |  308 ++++----
 src/gallium/drivers/cell/spu/spu_main.h            |   88 +--
 src/gallium/drivers/cell/spu/spu_per_fragment_op.c |  604 ++++++++++----
 src/gallium/drivers/cell/spu/spu_per_fragment_op.h |   58 +-
 src/gallium/drivers/cell/spu/spu_texture.c         |    2 +-
 src/gallium/drivers/cell/spu/spu_tile.c            |    6 +
 src/gallium/drivers/cell/spu/spu_tri.c             |   99 +--
 src/gallium/drivers/cell/spu/spu_util.c            |   21 +-
 src/gallium/drivers/cell/spu/spu_vertex_fetch.c    |    2 +-
 src/gallium/drivers/cell/spu/spu_vertex_shader.c   |    2 +-
 src/gallium/drivers/i915simple/i915_context.c      |    9 +-
 src/gallium/drivers/i915simple/i915_prim_vbuf.c    |   38 +-
 src/gallium/drivers/i915simple/i915_screen.c       |    5 +-
 src/gallium/drivers/i915simple/i915_texture.c      |   12 +-
 src/gallium/drivers/i965simple/brw_state_pool.c    |   10 +-
 src/gallium/drivers/i965simple/brw_tex_layout.c    |    4 +-
 src/gallium/drivers/softpipe/sp_clear.c            |   31 +-
 src/gallium/drivers/softpipe/sp_context.c          |   51 +-
 src/gallium/drivers/softpipe/sp_context.h          |   10 +-
 src/gallium/drivers/softpipe/sp_draw_arrays.c      |    9 +-
 src/gallium/drivers/softpipe/sp_flush.c            |   13 +
 src/gallium/drivers/softpipe/sp_fs_exec.c          |    2 +-
 src/gallium/drivers/softpipe/sp_fs_sse.c           |    2 +-
 src/gallium/drivers/softpipe/sp_headers.h          |   29 +-
 src/gallium/drivers/softpipe/sp_quad.c             |  102 ++--
 src/gallium/drivers/softpipe/sp_quad_alpha_test.c  |    7 +-
 src/gallium/drivers/softpipe/sp_quad_blend.c       |   16 +-
 src/gallium/drivers/softpipe/sp_quad_colormask.c   |    8 +-
 src/gallium/drivers/softpipe/sp_quad_coverage.c    |   14 +-
 src/gallium/drivers/softpipe/sp_quad_depth_test.c  |   52 +-
 src/gallium/drivers/softpipe/sp_quad_earlyz.c      |   12 +-
 src/gallium/drivers/softpipe/sp_quad_fs.c          |   22 +-
 src/gallium/drivers/softpipe/sp_quad_occlusion.c   |    2 +-
 src/gallium/drivers/softpipe/sp_quad_output.c      |   10 +-
 src/gallium/drivers/softpipe/sp_quad_stencil.c     |   44 +-
 src/gallium/drivers/softpipe/sp_quad_stipple.c     |   22 +-
 src/gallium/drivers/softpipe/sp_setup.c            |  375 +++++++--
 src/gallium/drivers/softpipe/sp_state_fs.c         |    2 +-
 src/gallium/drivers/softpipe/sp_surface.c          |  122 +---
 src/gallium/drivers/softpipe/sp_texture.c          |   10 +-
 src/gallium/drivers/trace/SConscript               |    2 -
 src/gallium/drivers/trace/tr_dump.c                |   12 +-
 src/gallium/drivers/trace/tr_stream.h              |   59 --
 src/gallium/drivers/trace/tr_stream_stdc.c         |  104 ---
 src/gallium/drivers/trace/tr_stream_wd.c           |  183 -----
 src/gallium/include/pipe/p_debug.h                 |    3 +
 src/gallium/include/pipe/p_format.h                |   29 +
 src/gallium/include/pipe/p_inlines.h               |   28 +-
 src/gallium/include/pipe/p_pointer.h               |   95 ---
 src/gallium/include/pipe/p_state.h                 |   14 +-
 src/gallium/include/pipe/p_thread.h                |  403 ++++------
 src/gallium/state_trackers/python/gallium.i        |    2 +-
 src/gallium/state_trackers/python/p_context.i      |   16 +-
 src/gallium/state_trackers/python/p_texture.i      |    6 +-
 src/gallium/state_trackers/python/samples/tri.py   |    3 +-
 src/gallium/state_trackers/python/st_device.c      |    8 +-
 .../state_trackers/python/st_softpipe_winsys.c     |    2 +-
 src/gallium/winsys/drm/intel/common/glthread.h     |  359 --------
 .../winsys/drm/intel/common/ws_dri_bufmgr.c        |  102 ++--
 .../winsys/drm/intel/common/ws_dri_bufpool.h       |    8 +-
 .../winsys/drm/intel/common/ws_dri_drmpool.c       |    4 +-
 .../winsys/drm/intel/common/ws_dri_fencemgr.c      |   66 +-
 .../winsys/drm/intel/common/ws_dri_mallocpool.c    |    6 +-
 .../winsys/drm/intel/common/ws_dri_slabpool.c      |   66 +-
 src/gallium/winsys/drm/intel/dri/intel_lock.c      |    8 +-
 src/gallium/winsys/drm/intel/dri/intel_screen.c    |    2 +-
 src/gallium/winsys/egl_xlib/sw_winsys.c            |    2 +-
 src/gallium/winsys/gdi/wmesa.c                     |    2 +-
 src/gallium/winsys/xlib/Makefile                   |    5 +-
 src/gallium/winsys/xlib/SConscript                 |    4 +-
 src/gallium/winsys/xlib/glxapi.c                   |   26 +-
 src/gallium/winsys/xlib/xm_api.c                   |   17 +-
 src/gallium/winsys/xlib/xm_winsys.c                |   61 ++-
 src/gallium/winsys/xlib/xm_winsys_aub.c            |    2 +-
 src/gallium/winsys/xlib/xmesaP.h                   |    3 +-
 src/glut/glx/glut_event.c                          |    7 +-
 src/mesa/main/ffvertex_prog.c                      |   54 +-
 src/mesa/shader/arbprogparse.c                     |    4 +-
 src/mesa/shader/prog_parameter.c                   |    4 +-
 src/mesa/shader/prog_print.c                       |    4 +-
 src/mesa/shader/prog_statevars.c                   |    2 +-
 src/mesa/shader/prog_statevars.h                   |    2 +-
 src/mesa/state_tracker/st_atom_constbuf.c          |    8 +-
 src/mesa/state_tracker/st_atom_shader.c            |    5 -
 src/mesa/state_tracker/st_cb_bitmap.c              |    8 +-
 src/mesa/state_tracker/st_cb_bufferobjects.c       |   18 +-
 src/mesa/state_tracker/st_cb_clear.c               |   11 +-
 src/mesa/state_tracker/st_cb_drawpixels.c          |    8 +-
 src/mesa/state_tracker/st_cb_fbo.h                 |    4 +
 src/mesa/state_tracker/st_cb_texture.c             |    7 -
 src/mesa/state_tracker/st_context.c                |    2 +-
 src/mesa/state_tracker/st_draw.c                   |  283 ++++++--
 src/mesa/state_tracker/st_framebuffer.c            |    2 +-
 src/mesa/state_tracker/st_gen_mipmap.c             |    8 +-
 src/mesa/state_tracker/st_public.h                 |   13 +
 src/mesa/state_tracker/st_texture.c                |   96 +++-
 src/mesa/state_tracker/st_texture.h                |    6 +
 src/mesa/vbo/vbo_exec_draw.c                       |   14 +-
 188 files changed, 6427 insertions(+), 3182 deletions(-)
 create mode 100644 configs/linux-cell-debug
 create mode 100644 progs/tests/quads.c
 create mode 100644 progs/trivial/long-fixed-func.c
 create mode 100644 src/gallium/auxiliary/util/u_stream.h
 create mode 100644 src/gallium/auxiliary/util/u_stream_stdc.c
 create mode 100644 src/gallium/auxiliary/util/u_stream_wd.c
 create mode 100644 src/gallium/auxiliary/util/u_timed_winsys.c
 create mode 100644 src/gallium/auxiliary/util/u_timed_winsys.h
 create mode 100644 src/gallium/drivers/cell/ppu/cell_gen_fragment.c
 create mode 100644 src/gallium/drivers/cell/ppu/cell_gen_fragment.h
 delete mode 100644 src/gallium/drivers/trace/tr_stream.h
 delete mode 100644 src/gallium/drivers/trace/tr_stream_stdc.c
 delete mode 100644 src/gallium/drivers/trace/tr_stream_wd.c
 delete mode 100644 src/gallium/include/pipe/p_pointer.h
 delete mode 100644 src/gallium/winsys/drm/intel/common/glthread.h

       via  cc7dd4fc1b3c765ca1ecd943d189bb156dae529d (commit)
       via  d50d68a1c940ed9c8d8c65e8e33667fa90d5baa1 (commit)
       via  90c93bbeeec1a8ca75b68004afc5d8cb689860bc (commit)
       via  7ce1d0fb6700fd4998a095de2c9edf5ed920464c (commit)
       via  5c459b392562d98f98efefe64ee2f531235c2ad4 (commit)
       via  1b5331d7ebcf7b1a1693972cf13407184cab1e48 (commit)
       via  73c6ae98c1c60635883a733f36d59d246e74aa2a (commit)
       via  f6bf8d9d410d94372b72f4f6ede6196ae5a4a67f (commit)
       via  a558369ec66e3d9e2b88f4df9a3b5a3704b19ef3 (commit)
       via  924653e37db4501d0f03721e9d74abffe46a3c72 (commit)
       via  f19903aa83e9b6e18930cbda14cfec3cca2e1bf2 (commit)
       via  aa4a08d429712fa516342ec02253c2591794ea5f (commit)
       via  283ffdf99605c536d00e03ad6ec91a6f8e006fc2 (commit)
       via  add86031db757b0e3abe48bd8fdea40d4e380e05 (commit)
       via  6092a057042c9f7a4cae0f0eb9e95307f5f850a1 (commit)
       via  5336e758a483d15d579ffe7cad536be95637d904 (commit)
       via  701fcee65db6b72f98e926d838956bbcc54f1cc6 (commit)
       via  284ab5a6127f8b452acaa0e10ac1d9ebc87fac3e (commit)
       via  ee582fd3a7a9ddbcb5595249201cf213a6c6f014 (commit)
       via  04ae4fba3c0a656cf2747fc994b99f99576d0e2b (commit)
       via  cd9722dcddcb41af3196860280d23542dc673700 (commit)
       via  0e79e474de164a765b9759398c83b6bfa16a0012 (commit)
       via  bb5becf1e289b2c9240d98299e9447a9673da9fc (commit)
       via  83054d9297d12dbd7bd7c86a6bed6a5fc63debdc (commit)
       via  8df4c3a21fe51280956e35d09ebacc9791b6a613 (commit)
       via  eb5b16d278e0f7ee0121049e43dfee1d52f2b0f7 (commit)
       via  dc1834a873726b9920c2cae6ffad86e09d4637ee (commit)
       via  d671cf460f99693ded1eccc6b32816d430098725 (commit)
       via  bfe45670aef35c358e7d22b8a9cb8cd6532b0e3d (commit)
       via  67c213499a9a533d84bc40ef5ef02e3350fcfc75 (commit)
       via  05ecd6d4020244b1bb6eb4f06f2333006b1bbfbd (commit)
       via  56e7c5522e37508d8ca83410479d09f1eddfac15 (commit)
       via  68e672a86468be3dfa5b09fa71152d7134d62fb3 (commit)
       via  b40732622fe670fbd13ad12b7c1848bd6c73eeb4 (commit)
       via  01f9e5120395f88bba8321e8639cac0bb9c85296 (commit)
       via  84cde72b3e5fa6e39c0df30fdb7985c0745816ef (commit)
       via  ebe6160d7c9ccbddd8b1cc4b0e25b3d61c54293d (commit)
       via  5a25628bd20684ac67adcb542647a0a2d7649a37 (commit)
       via  d25611ede005adddfd9c004b037d9202d94df69e (commit)
       via  a4a739eb58f70368ef87c195ea77629c1526e71f (commit)
       via  1da0a13389ce9709586058a8807c0c4120e520a2 (commit)
       via  7cfc294c70e96269055341d327622774c9173b37 (commit)
       via  2444c0c81acae9e2162a20002f8f72335133ead0 (commit)
       via  86a15954bf2adad0ab0dc5713a5bb446c9584103 (commit)
       via  52c2dd1f73e17c8352fe976e2ee4cdf049f81957 (commit)
       via  8af4794afcfa04351d4131d826daeb1312634f82 (commit)
       via  a267934b23aca1c39d228c23392862f8068c2968 (commit)
       via  a1886d539158fcc692d0d45985465be8e4bbe077 (commit)
       via  79200c908790238374c6059b9f781c9873584d95 (commit)
       via  2877727c9bb5496caf3c01625513900b03953fcc (commit)
       via  7071e774e49f0e7b5997ab634f5523efb2666952 (commit)
       via  78a4589b10b765dfb2a5862f292e51e0f4b06dce (commit)
       via  0f6e76d7f1f46b76ae19b089596ba6770c31dc5a (commit)
       via  a0b5ac424b8bc310223137e7dc00d2eeeddb9ec6 (commit)
       via  ce3cf63251b9d0de1de066f71d0c642360215f13 (commit)
       via  b8a7eef242f6bb97d90f6e0303d270b2cbc58421 (commit)
       via  50524c284528d467082266dfa18112f3cdc6202d (commit)
       via  53979d0a352fa74c533200bdba405915582a5974 (commit)
       via  46efe73daf4784da95ff5b38e5ec13474addcd93 (commit)
       via  2b53512073c0ecad66cfe1415cd19079ef2d4634 (commit)
       via  c9cd0f46282fb2b42b238aa0c267ad0585783040 (commit)
       via  2ebeab0422e6f492e9f40eebf2be92067de9d6f1 (commit)
       via  5cf2e226548f08c4b79a4eb289fd636a00079fb3 (commit)
       via  a69fc5129bdf2f245c5bf2e0fe7b542caf7809a9 (commit)
       via  9a64440154319738445e203339156e54232908ee (commit)
       via  dc248fc2881f4443bdc20a3b53b2ad24fee430ec (commit)
       via  27ae1bcabfd441c13f52f96a72f54ea70452781c (commit)
       via  93ad2d5a5e812e3a80f8157b4371df2f17510621 (commit)
       via  dd82c06ca371bacfda77d0eece5e29adee47e058 (commit)
       via  69897223a8e0b9e5cd187a3c0e2249ba73b652c0 (commit)
       via  ce8c08c2b03d8dc363deb14124372a6bbb4efd99 (commit)
       via  978f07bebdd5a368b8f900ed9cf77d3464a77ec0 (commit)
       via  55e89eecff6a8dc0433eca16e2ea699ec9636d1b (commit)
       via  2c45b5575ad4396fa939ada1ccd977cad1b09f10 (commit)
       via  1d7a213dad0fcc9aa16cdd36eff64d79ec37ae85 (commit)
       via  f754b45befee2e1c6650ed7c7ad13c82fc7b598b (commit)
       via  135a0dd75cb91285ca0fcec657f0256066e0a73e (commit)
       via  dffad1751e953c10742d5aee191d6f07482cdeea (commit)
       via  34cc7f5f1990e8e84628c24677a6bc715aeaf661 (commit)
       via  65a094101f8463cd0d26104a25a77f24bc2f6949 (commit)
       via  c93fff86ea5f8fb175159652e5b3ffa3882c2c2b (commit)
       via  78435d9142b4762cdf7193729bcd3148d990de3d (commit)
       via  a3e39a4aa950ae0f9d4c3106bdf438c6529bd63c (commit)
       via  e5085b83d0e3e16fcdc67bdab5cf7678d35984d4 (commit)
       via  e082298e3115d12e2acc80763a49acfb762072ae (commit)
       via  f89b74d97eff6c9a9875475af34fb15974ad75a2 (commit)
       via  5531c986bd34457e113163a68ff4ab98394738f0 (commit)
       via  a563a27c07eee9f0278c8473e27853fa2d1ad119 (commit)
       via  6c84652dc3877593b8b151366521289833707b40 (commit)
       via  439dca49920018e557d70b828f10aa815a8a9066 (commit)
       via  b035c85b3e3eaae071f1401f23be40b16cdee34f (commit)
       via  ba2812f23e05c63e0ea2a042dcb788c30fcbc37f (commit)
       via  6ebf712d88e7d1da949e224b93ff12ef601f2742 (commit)
       via  8b8952aa69bbaa0f87526cd08aaca7659595a675 (commit)
       via  2ab394a3b4557f1d79d38f24f899508d7b13cd35 (commit)
       via  1d5ad2c244f4b66ca1ac40c545482009ab46607c (commit)
       via  fafc36920eb79ddbe7049f6bbce18bcc279982d0 (commit)
       via  ab93aa774e2fc09b5f579eb13ce94cf22796902b (commit)
       via  01a76f4fee3dda55447dc93e6198ede105bdaef0 (commit)
       via  f637a96e85a51a66f2c53b91118a6815bb61d6e6 (commit)
       via  82086f5d21295d5ceffb0fd9963de7de4112964b (commit)
       via  a28aa1854378f735a6ac5c4b25fd7645cdbc1358 (commit)
       via  e3509fd4d09a19293ac3f2e0c92d758bc3ef308c (commit)
       via  feea0c9d958bc1645b09b288cd4d4756d0d6e61a (commit)
       via  2774b09d4e6957e202ece37337ae6201f7aa8eb7 (commit)
       via  4d27c027ab301cff64e7edb8a3eb731c2e8585c5 (commit)
       via  28b4090922f45e90804a21f83c04ec8b781cdf96 (commit)
       via  e54f1abca7369542c802ef531ff524caedfbcf65 (commit)
       via  f3a7463feefcf1f22c1309e1f5b0bfe381859686 (commit)
       via  39e8860e45fae2968917bdb7fe572c8793bbce30 (commit)
       via  c074b86cbc664e973486caaca0817b9a1654be3d (commit)
       via  9d9143d88985e69835b374ff330bab929275d68e (commit)
       via  102529cf1b6ab860d47e92a0bb58a0dce8b31cbc (commit)
       via  b36f90657370296b45c27d33d60c89fa31dc1d76 (commit)
       via  038d53cbdb9e504388141c25859bce12f7e8f87e (commit)
       via  5c198f660a1812d9b3970408695d04bdd74a5d1e (commit)
       via  a6c725839482f3d0f2af0eb15e5b6ab80184fb6c (commit)
       via  f4d707b40e8dde8cdf68f5c4595b838c138fcf9b (commit)
       via  5e184894d24fbf01ed826c39ea921c01ae6d9caf (commit)
       via  c118c654fa238f983f1550149466727fa81e51ab (commit)
       via  a4d04d71a46c88c5cbe08336111267ae9d0b7f11 (commit)
       via  a9345511d8c9f0707b0dc49f772b3740878f1bd3 (commit)
       via  8c092def6c8f59048341c585af9b752bfa1f0236 (commit)
       via  ef823dd543e1d98da98d188c53c8fc3285924364 (commit)
       via  8156c30a5d2d9504cd156b009545f5514f2628ed (commit)
       via  3c819926768e3879c8deaedfca964cc52ed1a7c5 (commit)
       via  380385ab7d0c1964464b40aeea237671189d19cb (commit)
       via  ee87d7d9ecc5eca261ce58115ae1ed2c273ceda6 (commit)
       via  cacf5f21efcbf0ddde90bf8b7fc2b9ba1873302e (commit)
       via  5048457372898a30478e33e66658277f5cead759 (commit)
       via  4e4cb0274050f300da9801256b66d3be528d549f (commit)
       via  c46c07f6c60edb60514756bd6af7918f70931e53 (commit)
       via  c6739e8cea287e17b248120e1a76480f1a25c082 (commit)
       via  c5f0fd95a43db4c69decd0fa54dc9eb2b2525690 (commit)
       via  a341586d030ebe36f972311cd70088537539b475 (commit)
       via  ee402e5ce2d9203558bf066642becb952399c3e9 (commit)
       via  ce40bc2ae088ce6defac6b2bf424dcfd0e141a75 (commit)
       via  8eb85f6f2a87e8a176569ad2270973024272fb21 (commit)
       via  6f33b778ae3130571d17a110187379ec0beecbd8 (commit)
       via  d29cf58b1d258ccaa65da5de655167370cbf5941 (commit)
       via  da66a7640de664e15d19cfe7cf918aa3d138799b (commit)
       via  0bb852fa49e7f9a31036089ea4f5dfbd312a4a3a (commit)
       via  b5ab3b7dfc42a568a156dec2fa043292014f98a7 (commit)
      from  685248bea1fef5fd6335982570e34d0f6672030d (commit)


- Commits -----------------------------------------------
commit cc7dd4fc1b3c765ca1ecd943d189bb156dae529d
Merge: 685248bea1fef5fd6335982570e34d0f6672030d d50d68a1c940ed9c8d8c65e8e33667fa90d5baa1
Author: Keith Whitwell <keith at tungstengraphics.com>
Date:   Thu Sep 11 18:32:05 2008 +0100

    Merge commit 'origin/gallium-0.1' into gallium-0.2
    
    Conflicts:
    
    	Makefile
    	progs/demos/Makefile
    	progs/glsl/Makefile
    	progs/redbook/Makefile
    	progs/samples/Makefile
    	progs/tests/Makefile
    	progs/trivial/Makefile
    	progs/xdemos/Makefile
    	src/gallium/Makefile
    	src/mesa/main/attrib.c
    	src/mesa/main/bufferobj.c
    	src/mesa/vbo/vbo_exec_draw.c

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




More information about the mesa-commit mailing list