mesa: Changes to 'drm-gem'

Ian Romanick idr at kemper.freedesktop.org
Fri Jul 25 18:31:52 PDT 2008


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

Summary of changes:
 Makefile                                           |   13 +-
 bin/mklib                                          |    2 +-
 configs/autoconf.in                                |   12 +-
 configs/default                                    |    9 +-
 configs/linux-dri-xcb                              |    2 +-
 configure.ac                                       |   61 +-
 docs/autoconf.html                                 |   11 +-
 docs/install.html                                  |   17 +-
 docs/relnotes-7.1.html                             |    7 +
 docs/shading.html                                  |   41 +-
 include/GL/glext.h                                 |    8 +-
 include/GL/glxext.h                                |    6 +-
 progs/demos/Makefile                               |    1 +
 progs/demos/fbo_firecube.c                         | 1041 ++++
 progs/demos/lodbias.c                              |    2 +-
 progs/demos/shadowtex.c                            |    1 -
 progs/tests/antialias.c                            |   12 +-
 progs/tools/trace/Makefile                         |    2 +-
 progs/tools/trace/gltrace_support.cc               |    4 +-
 progs/xdemos/glxinfo.c                             |    7 +
 src/egl/drivers/demo/Makefile                      |    5 +-
 src/egl/drivers/dri/Makefile                       |    3 +-
 src/egl/main/Makefile                              |    3 +-
 src/glu/Makefile                                   |   12 +-
 src/glu/glu.pc.in                                  |    4 +-
 src/glu/mesa/Makefile                              |    2 +-
 src/glu/sgi/Makefile                               |    3 +-
 src/glu/sgi/glu.exports                            |   59 +
 src/glut/beos/Makefile                             |    6 +-
 src/glut/directfb/Makefile                         |    2 +-
 src/glut/fbdev/Makefile                            |   10 +-
 src/glut/ggi/Makefile                              |    2 +-
 src/glut/glx/Makefile                              |   18 +-
 src/glut/glx/glut.pc.in                            |    4 +-
 src/glut/mini/Makefile                             |   19 +-
 src/glut/mini/glut.pc.in                           |    4 +-
 src/glw/Makefile                                   |   21 +-
 src/glw/glw.pc.in                                  |    4 +-
 src/glx/mini/Makefile                              |    2 +-
 src/glx/x11/.gitignore                             |    1 -
 src/glx/x11/Makefile                               |    2 +-
 src/glx/x11/dri2_glx.c                             |    2 +-
 src/glx/x11/dri_common.c                           |    4 +-
 src/glx/x11/dri_common.h                           |    2 +-
 src/glx/x11/dri_glx.c                              |    2 +-
 src/glx/x11/drisw_glx.c                            |    2 +-
 src/glx/x11/glxext.c                               |   11 +-
 src/glx/x11/indirect_vertex_array.c                |   14 +-
 src/mesa/Makefile                                  |   24 +-
 src/mesa/drivers/beos/Makefile                     |    5 +-
 src/mesa/drivers/directfb/Makefile                 |    2 +-
 src/mesa/drivers/dri/Makefile                      |   23 +-
 src/mesa/drivers/dri/Makefile.template             |    2 +-
 src/mesa/drivers/dri/common/dri_util.c             |    7 +-
 src/mesa/drivers/dri/common/extension_helper.h     |   32 +-
 src/mesa/drivers/dri/common/texmem.c               |    1 +
 src/mesa/drivers/dri/dri.pc.in                     |   10 +
 src/mesa/drivers/dri/i915/i830_context.c           |    8 -
 src/mesa/drivers/dri/i915/i915_context.c           |    1 -
 src/mesa/drivers/dri/i915/i915_texstate.c          |   11 +-
 src/mesa/drivers/dri/i965/brw_clip_line.c          |    2 +-
 src/mesa/drivers/dri/i965/brw_clip_state.c         |    2 +-
 src/mesa/drivers/dri/i965/brw_clip_tri.c           |    2 +-
 src/mesa/drivers/dri/i965/brw_context.c            |    2 +-
 src/mesa/drivers/dri/i965/brw_defines.h            |   13 +-
 src/mesa/drivers/dri/i965/brw_eu_emit.c            |   16 +-
 src/mesa/drivers/dri/i965/brw_fallback.c           |    5 +-
 src/mesa/drivers/dri/i965/brw_misc_state.c         |    8 +-
 src/mesa/drivers/dri/i965/brw_structs.h            |    4 +-
 src/mesa/drivers/dri/i965/brw_vs_emit.c            |    2 +-
 src/mesa/drivers/dri/i965/brw_wm_emit.c            |   15 +-
 src/mesa/drivers/dri/intel/intel_batchbuffer.h     |    4 +-
 src/mesa/drivers/dri/intel/intel_blit.c            |    5 +-
 src/mesa/drivers/dri/intel/intel_buffers.c         |   50 +-
 src/mesa/drivers/dri/intel/intel_chipset.h         |   10 +-
 src/mesa/drivers/dri/intel/intel_context.c         |   11 +-
 src/mesa/drivers/dri/intel/intel_mipmap_tree.c     |    5 +-
 src/mesa/drivers/dri/intel/intel_tex_image.c       |    5 +-
 src/mesa/drivers/dri/intel/intel_tex_validate.c    |    6 +-
 src/mesa/drivers/dri/nouveau/Makefile              |   54 -
 src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c   |  627 ---
 src/mesa/drivers/dri/nouveau/nouveau_bufferobj.h   |   77 -
 src/mesa/drivers/dri/nouveau/nouveau_card.c        |   17 -
 src/mesa/drivers/dri/nouveau/nouveau_card.h        |   49 -
 src/mesa/drivers/dri/nouveau/nouveau_card_list.h   |  226 -
 src/mesa/drivers/dri/nouveau/nouveau_context.c     |  422 --
 src/mesa/drivers/dri/nouveau/nouveau_context.h     |  241 -
 src/mesa/drivers/dri/nouveau/nouveau_ctrlreg.h     |   44 -
 src/mesa/drivers/dri/nouveau/nouveau_dri.h         |   28 -
 src/mesa/drivers/dri/nouveau/nouveau_driver.c      |  218 -
 src/mesa/drivers/dri/nouveau/nouveau_driver.h      |   42 -
 src/mesa/drivers/dri/nouveau/nouveau_fbo.c         |  289 -
 src/mesa/drivers/dri/nouveau/nouveau_fbo.h         |   30 -
 src/mesa/drivers/dri/nouveau/nouveau_fifo.c        |  153 -
 src/mesa/drivers/dri/nouveau/nouveau_fifo.h        |  222 -
 src/mesa/drivers/dri/nouveau/nouveau_lock.c        |   81 -
 src/mesa/drivers/dri/nouveau/nouveau_lock.h        |   69 -
 src/mesa/drivers/dri/nouveau/nouveau_mem.c         |  144 -
 src/mesa/drivers/dri/nouveau/nouveau_mem.h         |   23 -
 src/mesa/drivers/dri/nouveau/nouveau_msg.h         |   67 -
 src/mesa/drivers/dri/nouveau/nouveau_object.c      |   98 -
 src/mesa/drivers/dri/nouveau/nouveau_object.h      |   39 -
 src/mesa/drivers/dri/nouveau/nouveau_query.c       |  200 -
 src/mesa/drivers/dri/nouveau/nouveau_query.h       |   38 -
 src/mesa/drivers/dri/nouveau/nouveau_reg.h         | 4998 -----------------
 src/mesa/drivers/dri/nouveau/nouveau_screen.c      |  325 --
 src/mesa/drivers/dri/nouveau/nouveau_screen.h      |   61 -
 src/mesa/drivers/dri/nouveau/nouveau_shader.c      |  833 ---
 src/mesa/drivers/dri/nouveau/nouveau_shader.h      |  454 --
 src/mesa/drivers/dri/nouveau/nouveau_shader_0.c    | 1050 ----
 src/mesa/drivers/dri/nouveau/nouveau_shader_1.c    |   16 -
 src/mesa/drivers/dri/nouveau/nouveau_shader_2.c    |  264 -
 src/mesa/drivers/dri/nouveau/nouveau_span.c        |  123 -
 src/mesa/drivers/dri/nouveau/nouveau_span.h        |   39 -
 src/mesa/drivers/dri/nouveau/nouveau_state.c       |  368 --
 src/mesa/drivers/dri/nouveau/nouveau_state.h       |   50 -
 src/mesa/drivers/dri/nouveau/nouveau_state_cache.c |   69 -
 src/mesa/drivers/dri/nouveau/nouveau_state_cache.h |   29 -
 src/mesa/drivers/dri/nouveau/nouveau_swtcl.c       |  127 -
 src/mesa/drivers/dri/nouveau/nouveau_swtcl.h       |   55 -
 src/mesa/drivers/dri/nouveau/nouveau_sync.c        |  198 -
 src/mesa/drivers/dri/nouveau/nouveau_sync.h        |   69 -
 src/mesa/drivers/dri/nouveau/nouveau_tex.c         |   49 -
 src/mesa/drivers/dri/nouveau/nouveau_tex.h         |   38 -
 src/mesa/drivers/dri/nouveau/nv04_state.c          |  540 --
 src/mesa/drivers/dri/nouveau/nv04_swtcl.c          |  619 --
 src/mesa/drivers/dri/nouveau/nv04_swtcl.h          |   12 -
 src/mesa/drivers/dri/nouveau/nv10_state.c          | 1009 ----
 src/mesa/drivers/dri/nouveau/nv10_swtcl.c          |  714 ---
 src/mesa/drivers/dri/nouveau/nv10_swtcl.h          |   40 -
 src/mesa/drivers/dri/nouveau/nv20_shader.h         |  121 -
 src/mesa/drivers/dri/nouveau/nv20_state.c          |  824 ---
 src/mesa/drivers/dri/nouveau/nv20_vertprog.c       |  447 --
 src/mesa/drivers/dri/nouveau/nv30_fragprog.c       |  742 ---
 src/mesa/drivers/dri/nouveau/nv30_shader.h         |  379 --
 src/mesa/drivers/dri/nouveau/nv30_state.c          | 1002 ----
 src/mesa/drivers/dri/nouveau/nv30_vertprog.c       |  367 --
 src/mesa/drivers/dri/nouveau/nv40_fragprog.c       |  224 -
 src/mesa/drivers/dri/nouveau/nv40_shader.h         |  467 --
 src/mesa/drivers/dri/nouveau/nv40_vertprog.c       |  778 ---
 src/mesa/drivers/dri/nouveau/nv50_state.c          |  641 ---
 src/mesa/drivers/dri/r300/Makefile                 |    3 +
 src/mesa/drivers/dri/r300/r300_cmdbuf.c            |   11 +-
 src/mesa/drivers/dri/r300/r300_context.c           |    3 +
 src/mesa/drivers/dri/r300/r300_context.h           |   56 +-
 src/mesa/drivers/dri/r300/r300_fragprog.c          |  184 +-
 src/mesa/drivers/dri/r300/r300_fragprog.h          |   30 +-
 src/mesa/drivers/dri/r300/r300_fragprog_emit.c     | 2092 +-------
 src/mesa/drivers/dri/r300/r300_fragprog_swizzle.c  |  227 +
 src/mesa/drivers/dri/r300/r300_fragprog_swizzle.h  |   42 +
 src/mesa/drivers/dri/r300/r300_ioctl.c             |    9 +-
 src/mesa/drivers/dri/r300/r300_reg.h               |   11 +-
 src/mesa/drivers/dri/r300/r300_render.c            |    2 +-
 src/mesa/drivers/dri/r300/r300_state.c             |  171 +-
 src/mesa/drivers/dri/r300/r300_tex.c               |  212 +-
 src/mesa/drivers/dri/r300/r500_fragprog.c          |  207 +-
 src/mesa/drivers/dri/r300/r500_fragprog.h          |   32 +-
 src/mesa/drivers/dri/r300/r500_fragprog_emit.c     | 1596 +-----
 src/mesa/drivers/dri/r300/radeon_nqssadce.c        |  282 +
 src/mesa/drivers/dri/r300/radeon_nqssadce.h        |   96 +
 src/mesa/drivers/dri/r300/radeon_program.c         |  275 +-
 src/mesa/drivers/dri/r300/radeon_program.h         |  113 +-
 src/mesa/drivers/dri/r300/radeon_program_alu.c     |  475 ++-
 src/mesa/drivers/dri/r300/radeon_program_alu.h     |   12 +-
 src/mesa/drivers/dri/r300/radeon_program_pair.c    |  983 ++++
 src/mesa/drivers/dri/r300/radeon_program_pair.h    |  126 +
 src/mesa/drivers/dri/radeon/radeon_context.h       |    2 +
 src/mesa/drivers/dri/radeon/radeon_screen.c        |   27 +-
 src/mesa/drivers/dri/radeon/radeon_tex.h           |    4 +
 src/mesa/drivers/dri/radeon/radeon_texmem.c        |    2 +-
 src/mesa/drivers/dri/radeon/radeon_texstate.c      |   83 +-
 src/mesa/drivers/fbdev/Makefile                    |    3 +-
 src/mesa/drivers/osmesa/Makefile                   |   12 +-
 src/mesa/drivers/x11/Makefile                      |    7 +-
 src/mesa/drivers/x11/xm_tri.c                      |  192 +-
 src/mesa/gl.pc.in                                  |    4 +-
 src/mesa/glapi/gl_API.xml                          |   90 +-
 src/mesa/glapi/glapi.c                             |    7 +-
 src/mesa/main/api_validate.c                       |   23 +-
 src/mesa/main/buffers.c                            |    2 +-
 src/mesa/main/context.c                            |    1 +
 src/mesa/main/dd.h                                 |    2 +
 src/mesa/main/enums.c                              | 5874 ++++++++++----------
 src/mesa/main/execmem.c                            |    8 +-
 src/mesa/main/fbobject.c                           |   26 +-
 src/mesa/main/fbobject.h                           |    7 +-
 src/mesa/main/get.c                                |   63 +-
 src/mesa/main/get_gen.py                           |    9 +-
 src/mesa/main/getstring.c                          |  150 +-
 src/mesa/main/glheader.h                           |    6 +
 src/mesa/main/mtypes.h                             |    1 +
 src/mesa/main/shaders.c                            |   14 +-
 src/mesa/main/state.c                              |   17 +
 src/mesa/main/stencil.c                            |   96 +-
 src/mesa/main/texstate.c                           |   28 +-
 src/mesa/main/version.h                            |    2 +-
 src/mesa/shader/arbprogparse.c                     |    9 +-
 src/mesa/shader/prog_uniform.c                     |    4 +-
 src/mesa/shader/program.c                          |   62 +-
 src/mesa/shader/program.h                          |   13 +-
 src/mesa/shader/shader_api.c                       |  291 +-
 .../shader/slang/library/slang_common_builtin.gc   |   62 +-
 .../shader/slang/library/slang_common_builtin_gc.h | 1204 ++--
 src/mesa/shader/slang/library/slang_core.gc        |   69 +-
 src/mesa/shader/slang/library/slang_core_gc.h      |  865 ++--
 src/mesa/shader/slang/slang_codegen.c              |  449 +-
 src/mesa/shader/slang/slang_compile.c              |   63 +-
 src/mesa/shader/slang/slang_emit.c                 |   55 +-
 src/mesa/shader/slang/slang_emit.h                 |    8 +-
 src/mesa/shader/slang/slang_ir.c                   |   10 +-
 src/mesa/shader/slang/slang_link.c                 |   14 +
 src/mesa/shader/slang/slang_log.c                  |    3 +
 src/mesa/shader/slang/slang_print.c                |   84 +-
 src/mesa/shader/slang/slang_vartable.c             |    3 +-
 src/mesa/swrast/s_fragprog.c                       |   28 +-
 src/mesa/swrast/s_points.c                         |    2 +-
 src/mesa/tnl/t_vb_program.c                        |    2 +
 src/mesa/tnl_dd/t_dd_tritmp.h                      |    4 +-
 src/mesa/x86/assyntax.h                            |    3 +-
 src/mesa/x86/common_x86.c                          |   26 +
 220 files changed, 9956 insertions(+), 30803 deletions(-)
 create mode 100644 progs/demos/fbo_firecube.c
 create mode 100644 src/glu/sgi/glu.exports
 delete mode 100644 src/glx/x11/.gitignore
 create mode 100644 src/mesa/drivers/dri/dri.pc.in
 delete mode 100644 src/mesa/drivers/dri/nouveau/Makefile
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_bufferobj.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_card.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_card.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_card_list.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_context.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_context.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_ctrlreg.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_dri.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_driver.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_driver.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_fbo.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_fbo.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_fifo.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_fifo.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_lock.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_lock.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_mem.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_mem.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_msg.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_object.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_object.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_query.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_query.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_reg.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_screen.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_screen.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_shader.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_shader.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_shader_0.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_shader_1.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_shader_2.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_span.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_span.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_state.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_state.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_state_cache.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_state_cache.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_swtcl.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_swtcl.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_sync.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_sync.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_tex.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nouveau_tex.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nv04_state.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nv04_swtcl.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nv04_swtcl.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nv10_state.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nv10_swtcl.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nv10_swtcl.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nv20_shader.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nv20_state.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nv20_vertprog.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nv30_fragprog.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nv30_shader.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nv30_state.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nv30_vertprog.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nv40_fragprog.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nv40_shader.h
 delete mode 100644 src/mesa/drivers/dri/nouveau/nv40_vertprog.c
 delete mode 100644 src/mesa/drivers/dri/nouveau/nv50_state.c
 create mode 100644 src/mesa/drivers/dri/r300/r300_fragprog_swizzle.c
 create mode 100644 src/mesa/drivers/dri/r300/r300_fragprog_swizzle.h
 create mode 100644 src/mesa/drivers/dri/r300/radeon_nqssadce.c
 create mode 100644 src/mesa/drivers/dri/r300/radeon_nqssadce.h
 create mode 100644 src/mesa/drivers/dri/r300/radeon_program_pair.c
 create mode 100644 src/mesa/drivers/dri/r300/radeon_program_pair.h

       via  1e645b365900cf1c71ca5594bd6b549a1f203040 (commit)
       via  9bc9e0ecb0fb2069b2c123e665eb2118e358098f (commit)
       via  04c98089d15d27e541561d3fb35b9c28b699833b (commit)
       via  d4244683a61f66cfb78408a37cf2587587847f96 (commit)
       via  94979950e8991bd44899eb4067c3ae43449ce51e (commit)
       via  948f6e302ca3b6e0aa4d74eaef2e17dfb31bdfd5 (commit)
       via  d8ababdcc2e359b4325b036bf7ae5447498a6521 (commit)
       via  51bfb6aa992043f780a1641e6d53282374526c66 (commit)
       via  9a4be9785f932bedf727fbf88244ac1b158b09a5 (commit)
       via  6118d830a63d1637587671bdfa9810f3e31c24e7 (commit)
       via  7c2d7f8cf5b647c81d2df2ee7f9da6fec08f472a (commit)
       via  9dd73d58ae7850dcfa754cb443093825f00cac9f (commit)
       via  117533759fc6ee57f65a48e7115d4f564ed167f4 (commit)
       via  97988ccc46c0248177cd71937021ca8cc2a7452b (commit)
       via  b993d539a76e7f1446890a85e4b61deec4d4162d (commit)
       via  77497eb73b9aa349f41f3bcb493d84610e302371 (commit)
       via  776c60d3c33b05f59181a2052a9f03147bc51111 (commit)
       via  b4b7326717d3253656f9702fc04f06f8d210a6aa (commit)
       via  3bfedb7ed4a35cfcc7187bc22314833ef1d96ec9 (commit)
       via  73b8ee412110598b5c54ac695fcfce2878fdbe07 (commit)
       via  d9f4d04111133a7dab5e645021e56245febea2ae (commit)
       via  f49d345a51bb208fee19fc25762bcdb0e7f67174 (commit)
       via  0138435643d77478f5e06ef4572e704e0230163b (commit)
       via  33a25729e8d7563ac181303c6a8f69f35155f059 (commit)
       via  082cde143b880d4c87f11680b3a40a8e09c44367 (commit)
       via  29cb89d0c2cb17e2fa38563fc93794a6ebd75cf9 (commit)
       via  7d13dded5c581c2a1741252b1ef04f7ae4a9627b (commit)
       via  b7c54945fe212811d9749b623f582569522bc440 (commit)
       via  ece7183ff1b1bba1ae8e41b143e2ccbc38376dc3 (commit)
       via  4c6dcbf091b5a83c2b75e8b42299497b1b187109 (commit)
       via  e6218d071db46cbf98486f97b238cccf78c4aefa (commit)
       via  546c7fb221e2d0b7e56fb390f6e911a5f515328c (commit)
       via  461e17880650500cdbb35133ba12c3b809b778f1 (commit)
       via  716f70d7826c15cfaf09653ae525286f3eb59a07 (commit)
       via  b0d173f4053ee006717fb1c04cf12d1d687052e6 (commit)
       via  8c653f6e093624bfdef47ca83728465c86f338b7 (commit)
       via  7d7d114e5963abf57ad50159524f830e430ec51d (commit)
       via  27e3f7f21d4405edbdbe98b5b62b1eaeec0d4aab (commit)
       via  67108adb48f3be927d7fb92ba8f6bd5c9d165222 (commit)
       via  f214a848abb7cefb3d2c0bb7d172d54deeb05308 (commit)
       via  c62cb6be6c0e67a94320e3f25c182b07b3e78056 (commit)
       via  4430597bf6944951136a16c39a7bc458dc926800 (commit)
       via  0a7df3794c35ed53c0243ec2b5e954debedfdfe6 (commit)
       via  f7eb0cec69f35c88baa82b8366b37964269feb92 (commit)
       via  a63b90712aad81d544eb8931493a6c4a7805f7fb (commit)
       via  62db707a3dd4bf821b189e937fa133009007a2b5 (commit)
       via  5e600209f4908ece2ba8b7f880e1d7e950d2cfb4 (commit)
       via  93115c4b235896df097b91edec7458a8a4488c4e (commit)
       via  4fab47b13c214dc79e0ae5d8001521029ce34231 (commit)
       via  e81ba58bf4c20229677cdf89b5970b55cefb2199 (commit)
       via  3b8081603bf846285e56a6ecafaf182935fd8733 (commit)
       via  db072baaaf6adcd176ea7e4d67b77177de7eca31 (commit)
       via  4f5d97ee9eae6f2adf27e2297f955b601483d61b (commit)
       via  9eee7f260f4474f9eea7384b94619b3f7fee017b (commit)
       via  bfb27b5fc020437d95b1185f0fce850209744d92 (commit)
       via  2d766923c45b544cca17c7fefe625715cf1fd1fe (commit)
       via  cf0ae102dbc34bf75e853c2ece630fe18dd4d41e (commit)
       via  8774fcd89acc9e180e0cb135bd62646f58cb623e (commit)
       via  11d711df360265f25dc5a96cc3a4c5a2d34f5b64 (commit)
       via  b6765c34993b08bba4acf20738c8938413ed4daf (commit)
       via  d8d086c20b5a43353c4980cf234d8329900585f5 (commit)
       via  7904c9fad4c2cb2a4153258a9e86e530a0330a78 (commit)
       via  b0ef353b4696672ecaea4b370b612bbb482880ca (commit)
       via  6c44c6d020ce7bc8e65ef69fefa0db4cc6157bed (commit)
       via  99803a4ec90d70363305c0652203550d63f086ec (commit)
       via  e97ab72b593278edeac9f9b71b8237a79247c7c7 (commit)
       via  b52398571b7f5c537c2f5e1c87f1b8bdf3d8ea9b (commit)
       via  ac05da56ec1dd14876dbf3fde37aa951b9215f5b (commit)
       via  4ca0af188267ab92f84223acd7f8b957be0cb5f6 (commit)
       via  a2e435054c0d410e92d1e76a23f8d801a606537d (commit)
       via  75e4db18049f3284197c9a8deabd9dd74aa7920e (commit)
       via  2f1b5ffcda283cebc97bd440b5af44168a9c8b00 (commit)
       via  e4d9cc94b82090ca6822789458edb2364f271f30 (commit)
       via  ee2a10112323d11ddc613a043761481aa1485f19 (commit)
       via  7d3feef9d6d75ffb7dad51cef37059192a6be4ab (commit)
       via  2be54a8e8ccb206eeedd319cf48a3c81797b83a4 (commit)
       via  44029f15a8c841d0deb3c7b477bc36ca7a9cd3e6 (commit)
       via  6fe78576291d38108c8815dc33fa44a8ae656f71 (commit)
       via  c71fa34728ef4eddd074aeb2bee49ae6a7acb3d1 (commit)
       via  fd6cb1b11d526d2e22d51441ab2629a10323e7b4 (commit)
       via  d14b7890a44fe7a3bccd9152645f50b0edb850d8 (commit)
       via  477d597df69845e3fcd84605b26801c14a0ce382 (commit)
       via  92c075eeb7c330ea420400d1c2bae57356b19f03 (commit)
       via  a36bf890e8be3473f6a98f5ba4369e3acc0463ad (commit)
       via  e6e4f25aa5433fc77a3c1b0dba2300cc4cee5d33 (commit)
       via  11ac5b2456575060627e9f52946d7d0e218a228d (commit)
       via  056689d457924ba4d8a0723d0c5f24383d1757d9 (commit)
       via  2b2cb566563b9f1f9739327ef9874143af838850 (commit)
       via  4746752f167c674722b46ab3840297d48e6d889d (commit)
       via  03abd021f2fa1d043682c9f1bbb1c080fba6b033 (commit)
       via  62bccd6df0c963a14e801bcac95dc8046b978a7f (commit)
       via  77fdfaa23adeaaf6a217ef1ee751410c6a5b0d21 (commit)
       via  364d45a3e1629f32c6ab5407f92618a16c9d45e0 (commit)
       via  dea8719f00ad46ed66b5d4f5e6c0b71e2d1054e9 (commit)
       via  85b46fbe9cfc8de8871d6adb0b2287c5837d3028 (commit)
       via  13c44679ad42886544036f49597dcfc0d4b7e925 (commit)
       via  09e587fcf3c77860eacf16a45c6cf1a9a54cc605 (commit)
       via  82635aad4203d44648dd6e345ec2b5e21ff06510 (commit)
       via  e187627c1d3b06e5d185989dd3d37f09a8953a1b (commit)
       via  845e3f701dec29f08e5759969c165b3d812e5afe (commit)
       via  1f4d0748ba92ff2c44faadc31a99f07e1bea28fb (commit)
       via  e06565b103828b276fb10e3c4b2d94b36de05987 (commit)
       via  b931a0c1d9128b7fb402915089e1fd2496f65349 (commit)
       via  9157b1e09a8948e9e084ed3ce2a3537a6bac2005 (commit)
       via  0c1e96e6d38c0acfd3fe6b4116f2a67f5bf62136 (commit)
       via  530df581dd1a502041b44afee8023a09d5b7e59f (commit)
       via  011185396b1bb13fcba6619912948bbd2154936d (commit)
       via  3dc6591a7c85b6a05551ce91b69e57d23148bf57 (commit)
       via  7acb7c1ac058d11d649b615bfcabf29b5a74a801 (commit)
       via  d866cb3712cc4db0d3798b91039a482453e58700 (commit)
       via  7f4f2ac39de7a5425bcfbd362b688f62f6003afd (commit)
       via  6e46c121f9efc941473f797e0a388146a9599eea (commit)
       via  1dc20c7916e873dd154d62f885f849c87211c192 (commit)
       via  b3e1f9bd521ab25fc1cb313902cd77c6c274a918 (commit)
       via  1726b7d1d336465dca10a5bd0a8a02fcf5f2e455 (commit)
       via  cb79c5c7c62a661c4b7b4efcf3884ee1dedafe4f (commit)
       via  36a582641119671688a9f366e5bfa1ab3e8b9cbc (commit)
       via  a405d69063c8bae28bd5808e297070d65d90a421 (commit)
       via  a2cddf58d2787a1ed027cbc7bc25bf4aa001e989 (commit)
       via  918f3b17e5a3f94a7676a815c9b64cee054311ea (commit)
       via  18adc71822463b5e50bcb23d682726b1a44870aa (commit)
       via  5ef4e4ffb8053db87f52df3c9b2ddb71d9c7d6e5 (commit)
       via  6befdca6a3d65d7e49c0c54a7a8f091cd05034ea (commit)
       via  43346fb1fb43f91cb3e90d84b442dc08d6c9550d (commit)
       via  ea190fe05098d166c38d168d6a3d743c3acfe722 (commit)
       via  abd71144f0c34c071739dbb00378520fb02b5b61 (commit)
       via  21e0d47514ea16c85342549dc8843be1b9bbc6ef (commit)
       via  c52d6ad465dd4fddcd40e50e93f66469dcd8ffea (commit)
       via  028739faedd97a67b2348e4561840cc13785b26c (commit)
       via  e19af171cf013098c35990069225a87c3a04e197 (commit)
       via  9ae4d778d8dd56572b92b7ecaca4f0cabe63d229 (commit)
       via  32a5c4033665d51277c733318ac0461e5f85ad09 (commit)
       via  b2247c7d29667047cd34180826a8966675f8be3a (commit)
       via  011b0e51e47e52ad9e29b31b3b4de1a5b77b3768 (commit)
       via  2ce4b985a56fc05ea1f33b68a987bf866ab06d11 (commit)
       via  634d2af2b01f4e7ce8fa3ff65f64a446f859821a (commit)
       via  d3f7b463c3975c070503053e4ad70af99016a756 (commit)
       via  bcc2a3d7e3c5f81bb5a45b8d628a133f3b5499a5 (commit)
       via  5cae1b747bf7013124c21f15c410635c16593656 (commit)
       via  bb1744970d74432692f2e109fca1dc31593605af (commit)
       via  23e9b43ce4a6ad5875f69363dec7d2baa8afa2ea (commit)
       via  4002b75e6267ecd0f9e3093e221e34ed5c8485d4 (commit)
       via  a74d22ba715da5e52efb15aebd15a74851f87d43 (commit)
       via  543893eefdc82ecd21e346320e89a471c5c12158 (commit)
       via  0918023c28775ef6126e9f695a976ff199cd9a13 (commit)
       via  bc775066aa9bbbf0cf5f1d5ced81f81e4cb0b731 (commit)
       via  6cb12704916822aa4d0895a6427e110afe4bfa58 (commit)
       via  b429e9b2d74ece0906602d2f843c0f8bf74c44f4 (commit)
       via  f6da1453c5b4add37518b2e1f27abb02854864f2 (commit)
       via  985e1cdfe82336d3ce97470eaf98c3c9d54532c8 (commit)
       via  3b132b297febf99d7f3989d82f09578471880321 (commit)
      from  e5022c3fdf9888857f22f9a1690035ff3f90d36b (commit)


- Commits -----------------------------------------------
commit 1e645b365900cf1c71ca5594bd6b549a1f203040
Merge: e5022c3fdf9888857f22f9a1690035ff3f90d36b 9bc9e0ecb0fb2069b2c123e665eb2118e358098f
Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Fri Jul 25 18:31:44 2008 -0700

    Merge branch 'master' into drm-gem
    
    Conflicts:
    
    	src/mesa/drivers/dri/common/dri_bufmgr.c
    	src/mesa/drivers/dri/i965/brw_wm_surface_state.c

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



More information about the mesa-commit mailing list