mesa: Changes to 'drm-gem'

Keith Packard keithp at kemper.freedesktop.org
Wed Jun 4 06:04:01 UTC 2008


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

Summary of changes:
 .gitignore                                      |    1 +
 Makefile                                        |   45 +-
 acinclude.m4                                    |  119 +
 bin/version.mk                                  |   17 +
 configs/autoconf.in                             |    3 -
 configs/default                                 |    4 +-
 configs/freebsd-dri                             |    1 -
 configs/linux-dri                               |    1 -
 configure.ac                                    |  436 +-
 docs/autoconf.html                              |    3 +-
 docs/devinfo.html                               |    4 +-
 docs/install.html                               |  126 +-
 docs/relnotes-7.1.html                          |   17 +-
 doxygen/Makefile                                |    4 +-
 include/GL/internal/dri_interface.h             |   57 +
 include/GL/internal/glcore.h                    |   73 -
 include/GL/wmesa.h                              |    2 +-
 progs/Makefile                                  |    2 +-
 progs/beos/Makefile                             |    4 +-
 progs/demos/Makefile                            |    6 +-
 progs/egl/Makefile                              |    6 +-
 progs/fbdev/Makefile                            |    4 +-
 progs/fp/Makefile                               |    6 +-
 progs/glsl/Makefile                             |    8 +
 progs/glsl/multitex.c                           |  285 ++
 progs/glsl/multitex.frag.txt                    |   15 +
 progs/glsl/multitex.vert.txt                    |   10 +
 progs/miniglx/Makefile                          |    4 +-
 progs/slang/Makefile                            |    2 +-
 progs/tests/Makefile                            |    6 +-
 progs/tests/fbotest2.c                          |    1 +
 progs/tests/mipmap_limits.c                     |   32 +-
 progs/trivial/Makefile                          |    6 +-
 progs/trivial/tri.c                             |    7 +-
 progs/vp/Makefile                               |    6 +-
 progs/xdemos/.gitignore                         |    1 +
 progs/xdemos/glthreads.c                        |   23 +-
 src/Makefile                                    |    2 +-
 src/egl/Makefile                                |    6 +-
 src/egl/drivers/demo/Makefile                   |    4 +-
 src/egl/drivers/dri/Makefile                    |    4 +-
 src/egl/main/Makefile                           |    4 +-
 src/glu/Makefile                                |    6 +-
 src/glu/mesa/Makefile                           |    2 +-
 src/glu/sgi/Makefile                            |    2 +-
 src/glut/directfb/Makefile                      |    2 +-
 src/glut/fbdev/Makefile                         |    2 +-
 src/glut/glx/Makefile                           |    2 +-
 src/glut/mini/Makefile                          |    2 +-
 src/glw/Makefile                                |    2 +-
 src/glx/Makefile                                |    4 +-
 src/glx/mini/Makefile                           |    2 +-
 src/glx/x11/Makefile                            |    4 +-
 src/glx/x11/dri_glx.c                           |    2 +-
 src/glx/x11/indirect_dispatch.c                 | 5889 ----------------------
 src/glx/x11/indirect_dispatch.h                 | 1047 ----
 src/glx/x11/indirect_dispatch_swap.c            | 6051 -----------------------
 src/glx/x11/indirect_reqsize.c                  |  832 ----
 src/glx/x11/indirect_reqsize.h                  |  121 -
 src/glx/x11/indirect_size_get.c                 | 1210 -----
 src/glx/x11/indirect_size_get.h                 |  102 -
 src/glx/x11/indirect_table.c                    | 1596 ------
 src/mesa/Makefile                               |   78 +-
 src/mesa/drivers/beos/Makefile                  |    8 +-
 src/mesa/drivers/common/driverfuncs.c           |   39 +-
 src/mesa/drivers/common/driverfuncs.h           |    4 -
 src/mesa/drivers/directfb/Makefile              |    2 +-
 src/mesa/drivers/dri/Makefile                   |    8 +-
 src/mesa/drivers/dri/common/dri_util.c          |  134 +-
 src/mesa/drivers/dri/common/dri_util.h          |   23 +-
 src/mesa/drivers/dri/common/utils.c             |  229 +-
 src/mesa/drivers/dri/common/utils.h             |   29 +-
 src/mesa/drivers/dri/common/vblank.c            |    4 +-
 src/mesa/drivers/dri/common/xmlpool/Makefile    |    4 +-
 src/mesa/drivers/dri/glcore/Makefile            |   84 -
 src/mesa/drivers/dri/glcore/glcore_driver.c     |  128 -
 src/mesa/drivers/dri/i965/brw_draw.c            |   22 +-
 src/mesa/drivers/dri/i965/brw_draw_upload.c     |    9 +-
 src/mesa/drivers/dri/intel/intel_ioctl.c        |   11 +
 src/mesa/drivers/dri/intel/intel_tex.c          |   13 +-
 src/mesa/drivers/dri/intel/intel_tex.h          |    1 -
 src/mesa/drivers/dri/intel/intel_tex_copy.c     |    4 +-
 src/mesa/drivers/dri/intel/intel_tex_image.c    |    4 +-
 src/mesa/drivers/dri/intel/intel_tex_subimage.c |    4 +-
 src/mesa/drivers/dri/r200/r200_ioctl.c          |   10 +-
 src/mesa/drivers/dri/r300/Makefile              |    1 +
 src/mesa/drivers/dri/r300/r300_cmdbuf.c         |  193 +-
 src/mesa/drivers/dri/r300/r300_context.c        |    5 +
 src/mesa/drivers/dri/r300/r300_context.h        |   72 +-
 src/mesa/drivers/dri/r300/r300_emit.c           |   40 +-
 src/mesa/drivers/dri/r300/r300_emit.h           |   29 +
 src/mesa/drivers/dri/r300/r300_fragprog.c       |  295 +-
 src/mesa/drivers/dri/r300/r300_fragprog.h       |   64 +-
 src/mesa/drivers/dri/r300/r300_ioctl.c          |  261 +-
 src/mesa/drivers/dri/r300/r300_reg.h            | 2072 +++++---
 src/mesa/drivers/dri/r300/r300_render.c         |   25 +-
 src/mesa/drivers/dri/r300/r300_shader.c         |   41 +-
 src/mesa/drivers/dri/r300/r300_state.c          |  849 +++-
 src/mesa/drivers/dri/r300/r300_swtcl.c          |   59 +-
 src/mesa/drivers/dri/r300/r300_texstate.c       |   28 +-
 src/mesa/drivers/dri/r300/r300_vertprog.c       |    6 +-
 src/mesa/drivers/dri/r300/r500_fragprog.c       | 1667 +++++++
 src/mesa/drivers/dri/r300/r500_fragprog.h       |   79 +
 src/mesa/drivers/dri/r300/radeon_context.c      |    2 +-
 src/mesa/drivers/dri/r300/radeon_ioctl.c        |   10 +-
 src/mesa/drivers/dri/radeon/radeon_chipset.h    |  109 +
 src/mesa/drivers/dri/radeon/radeon_ioctl.c      |   10 +-
 src/mesa/drivers/dri/radeon/radeon_screen.c     |  169 +-
 src/mesa/drivers/dri/radeon/radeon_screen.h     |    2 +
 src/mesa/drivers/dri/swrast/Makefile            |   24 +
 src/mesa/drivers/dri/swrast/swrast.c            |  727 +++
 src/mesa/drivers/dri/swrast/swrast_priv.h       |  142 +
 src/mesa/drivers/dri/swrast/swrast_span.c       |  367 ++
 src/mesa/drivers/dri/swrast/swrast_spantemp.h   |  328 ++
 src/mesa/drivers/dri/unichrome/via_context.c    |   56 +-
 src/mesa/drivers/dri/unichrome/via_screen.c     |    2 +-
 src/mesa/drivers/dri/unichrome/via_tex.c        |    4 +-
 src/mesa/drivers/glslcompiler/Makefile          |    2 +-
 src/mesa/drivers/windows/gdi/mesa.def           |   31 +-
 src/mesa/drivers/windows/gdi/wgl.c              |   14 +-
 src/mesa/drivers/x11/fakeglx.c                  |    9 +-
 src/mesa/drivers/xorg/.gitignore                |    3 -
 src/mesa/drivers/xorg/Makefile                  |   95 -
 src/mesa/drivers/xorg/glcore.c                  |   24 -
 src/mesa/glapi/Makefile                         |   70 +-
 src/mesa/glapi/glapi.c                          |   11 +-
 src/mesa/glapi/glthread.c                       |    4 +-
 src/mesa/glapi/glthread.h                       |    6 +-
 src/mesa/main/config.h                          |    1 +
 src/mesa/main/context.c                         |   40 +-
 src/mesa/main/dd.h                              |    6 +
 src/mesa/main/dlist.c                           |   33 +
 src/mesa/main/fbobject.c                        |    2 +-
 src/mesa/main/mipmap.c                          |    1 -
 src/mesa/main/mipmap.h                          |    1 -
 src/mesa/main/mtypes.h                          |   30 +-
 src/mesa/main/state.c                           |   28 +-
 src/mesa/main/texcompress_fxt1.c                |   17 +-
 src/mesa/main/texenvprogram.c                   |   60 +-
 src/mesa/main/texstore.c                        |   32 +-
 src/mesa/main/version.h                         |    2 +-
 src/mesa/shader/arbprogparse.c                  |    5 +-
 src/mesa/shader/descrip.mms                     |    7 +-
 src/mesa/shader/prog_execute.c                  |   10 +-
 src/mesa/shader/prog_execute.h                  |    2 +
 src/mesa/shader/prog_instruction.c              |  211 +-
 src/mesa/shader/prog_instruction.h              |    9 +
 src/mesa/shader/prog_parameter.c                |   52 +-
 src/mesa/shader/prog_parameter.h                |   10 +
 src/mesa/shader/prog_print.c                    |   42 +-
 src/mesa/shader/prog_statevars.c                |   52 +-
 src/mesa/shader/prog_statevars.h                |    5 +
 src/mesa/shader/prog_uniform.c                  |  157 +
 src/mesa/shader/prog_uniform.h                  |   91 +
 src/mesa/shader/program.c                       |  388 ++-
 src/mesa/shader/program.h                       |   33 +
 src/mesa/shader/programopt.c                    |  117 +-
 src/mesa/shader/programopt.h                    |    2 +
 src/mesa/shader/shader_api.c                    |  648 ++--
 src/mesa/shader/shader_api.h                    |  103 +-
 src/mesa/shader/slang/library/Makefile          |    2 +-
 src/mesa/shader/slang/slang_codegen.c           |   11 +-
 src/mesa/shader/slang/slang_compile.c           |   15 +
 src/mesa/shader/slang/slang_emit.c              |   10 +-
 src/mesa/shader/slang/slang_link.c              |  252 +-
 src/mesa/shader/slang/slang_link.h              |    4 -
 src/mesa/sources                                |    1 +
 src/mesa/swrast/s_drawpix.c                     |    4 +-
 src/mesa/swrast/s_fragprog.c                    |   14 +-
 src/mesa/swrast/s_span.c                        |    1 -
 src/mesa/swrast/s_texstore.c                    |   10 +-
 src/mesa/tnl/t_context.h                        |    2 +-
 src/mesa/tnl/t_vp_build.c                       |   47 +-
 src/mesa/vbo/vbo_exec_draw.c                    |    2 +-
 src/mesa/vbo/vbo_save_draw.c                    |    2 +-
 src/mesa/x86-64/Makefile                        |    2 +-
 src/mesa/x86/Makefile                           |    2 +-
 src/mesa/x86/read_rgba_span_x86.S               |    4 +-
 windows/VC8/mesa/gdi/gdi.vcproj                 |    4 +
 windows/VC8/mesa/glu/glu.vcproj                 |   16 +-
 windows/VC8/mesa/mesa.sln                       |    3 +
 windows/VC8/mesa/mesa/mesa.vcproj               |    8 +
 182 files changed, 9360 insertions(+), 20359 deletions(-)
 create mode 100644 acinclude.m4
 create mode 100755 bin/version.mk
 create mode 100644 progs/glsl/multitex.c
 create mode 100644 progs/glsl/multitex.frag.txt
 create mode 100644 progs/glsl/multitex.vert.txt
 delete mode 100644 src/glx/x11/indirect_dispatch.c
 delete mode 100644 src/glx/x11/indirect_dispatch.h
 delete mode 100644 src/glx/x11/indirect_dispatch_swap.c
 delete mode 100644 src/glx/x11/indirect_reqsize.c
 delete mode 100644 src/glx/x11/indirect_reqsize.h
 delete mode 100644 src/glx/x11/indirect_size_get.c
 delete mode 100644 src/glx/x11/indirect_size_get.h
 delete mode 100644 src/glx/x11/indirect_table.c
 delete mode 100644 src/mesa/drivers/dri/glcore/Makefile
 delete mode 100644 src/mesa/drivers/dri/glcore/glcore_driver.c
 create mode 100644 src/mesa/drivers/dri/r300/r500_fragprog.c
 create mode 100644 src/mesa/drivers/dri/r300/r500_fragprog.h
 create mode 100644 src/mesa/drivers/dri/swrast/Makefile
 create mode 100644 src/mesa/drivers/dri/swrast/swrast.c
 create mode 100644 src/mesa/drivers/dri/swrast/swrast_priv.h
 create mode 100644 src/mesa/drivers/dri/swrast/swrast_span.c
 create mode 100644 src/mesa/drivers/dri/swrast/swrast_spantemp.h
 delete mode 100644 src/mesa/drivers/xorg/.gitignore
 delete mode 100644 src/mesa/drivers/xorg/Makefile
 delete mode 100644 src/mesa/drivers/xorg/glcore.c
 create mode 100644 src/mesa/shader/prog_uniform.c
 create mode 100644 src/mesa/shader/prog_uniform.h

       via  dbf3c5247c90bd35c0b2002e3b972a2dd4c8b130 (commit)
       via  0b734bd7cf921592eee441f759687e10f48a2cbc (commit)
       via  f688827ebdc7fa8ef1160086565f9e109768a250 (commit)
       via  96adcc2e214e2fdc2ad15ecac20b1066c6cdd1ca (commit)
       via  934a53eb4406df9297f86cf12cacf5ba423e8af7 (commit)
       via  7ead1c5d061b86027cb5e821fdcaa9cdce1d9537 (commit)
       via  915e49e0fd61d7b8eee304d756813455612e98d9 (commit)
       via  c9ea62444c6969da8706ea88e12df8c458a6acce (commit)
       via  d9c7c5f071f5bf2a7516d877c9ab84b2b2b91779 (commit)
       via  3225e2cdb60868ace70db16407ec5cf5fc64be3c (commit)
       via  9a34c68faf2a9e83e60ed4833816db56342f658d (commit)
       via  bffa0909cbd395aac7d974c0475dc7ed9fd208a9 (commit)
       via  ea58dceb1c803953d3a9b77adcac5ee131d1c038 (commit)
       via  c9679ce1d22e706bfe1cdc6a5cf8553ffedb2842 (commit)
       via  7013eecf282d2b1151cdb5cd3ba356295e1e1b79 (commit)
       via  a947c1a3fe100dfc1ac519010673d1136f1dcd08 (commit)
       via  4a69c4173d6bf120b5abbcb38072fa053918d393 (commit)
       via  ef56a563a1b05cf60d8990f76db7fd59e8db19a0 (commit)
       via  1190261c470bf810721adc866ba486f6ddd001c2 (commit)
       via  645c131264ae169cf64753a930ada500b6933fe7 (commit)
       via  a1a0e51043cc6feea7811113139cb5b6d753403e (commit)
       via  328621509f4690fb945201a90425662e4fd2fc2d (commit)
       via  377016d728ace47c9eeb3ac2f01191608ab060f6 (commit)
       via  74a217fbcd8ea05dc97eda06eb0b46e35979579d (commit)
       via  5adc76389825a7a073ae37e78b1771ee7e30e9a4 (commit)
       via  5429d4a04a90f1e8664336143985973729a97768 (commit)
       via  3e6c791390fd03ca04302f1312b94cd3c5ca0054 (commit)
       via  261a15cf6389eba434d6857e78b524707803ed08 (commit)
       via  85af4fde7fd5c7f6a6976fbd9d6529a9082f42b7 (commit)
       via  867f5aac5361eda657491a98feca33c91eae3218 (commit)
       via  5552500cdfc4b97f5c824f6af1f8213c785693f9 (commit)
       via  8bd70a7bbefe420dd696bfd6dc3b64d3dd17e884 (commit)
       via  6525d250a8d6950c4b1dc27e15ad369c383c2827 (commit)
       via  5173fc666995a296fdfc741547dfedf5e883a9bf (commit)
       via  0128703f033eff65200163361f3099a2c57fd711 (commit)
       via  e903f51bc43fde1f61a779fd8017c96a651781ac (commit)
       via  0ccffacee268ec80e5ef680d75cbbf8ed9603342 (commit)
       via  9d3359d12a709db7457927ac536244101d6a1b30 (commit)
       via  8c39e24ec397200420146faa4f48672eadeac9b2 (commit)
       via  a242b331c6567af20d3cad804664bda30e1e9586 (commit)
       via  9412aee4dc6a94ffc3d4043e8c843ba051f5507b (commit)
       via  eee53dfb22e0c950b11a466ebcd5d764864229cd (commit)
       via  7278266612fe6be91b30b084de666a1ac4f2c20b (commit)
       via  774b3bc5a57dc768ed09516a6b91358783c63f72 (commit)
       via  4af22c9076954d544417e615561695695773708d (commit)
       via  8eb7df63029ebc7c30c67c0266d727f9c240b402 (commit)
       via  b5372746ffcaab4ce158c1ca205e039a561ca01f (commit)
       via  9f03e93de9a0b75485d1de8a990513b0c2582385 (commit)
       via  7b88f40116cc6ccff5c0f7c923a0dca31187480e (commit)
       via  5a5ba350696e6b753a9e49da010513670b697db5 (commit)
       via  b57ba7c5b0205ad6885530f63cef85401386565b (commit)
       via  5499685931cac382bffb053ab527d882a7d0e109 (commit)
       via  a2db33219debbc1a2a64a8b096b321d263cfacb5 (commit)
       via  21b352bb146e1b35050c1315b0d44689dcfdc8d6 (commit)
       via  27d8fcd506942b115e480cfe9ca811194736579a (commit)
       via  f776f693c0aca4d01cc2bfdaedbb527062189e6d (commit)
       via  594760148cb42cdaf568eef63357fac1c1b7f124 (commit)
       via  bd74d2aa26a2b87b05e8d086c020a6bdde9e06a7 (commit)
       via  810270ad11d51c65e33bbe9337c2db9dd4cebb98 (commit)
       via  f1d04cd76681a3b8d37bc1a06b7ab36350087135 (commit)
       via  b6b51906824bbf02769eeaf42646ff709877ae42 (commit)
       via  6f918a9fda91321b50ae327791787f21417226c8 (commit)
       via  de27760a3c8567b76699e1bd7d1f3692a8f0f525 (commit)
       via  af77de66d9e97a1f37849a51f7b48ae36a0c8127 (commit)
       via  e9031d6f63947963e2105e5aaf89cb57dcd9a122 (commit)
       via  95eb6422c718d3d4ef34ec35bffa83307025793d (commit)
       via  73d66a3c63f380a27e16f5287fb37ed1d98bf818 (commit)
       via  c1d4644f487a3ff4dcb3ef32995fed30cd72eeba (commit)
       via  b4a4829cd50f7110ddbdd0770297cd845ab4764d (commit)
       via  6e13d6d17ef12d5576175c9b03e96632428c6e76 (commit)
       via  44e05f08702d650bd66b816af429a856ff542311 (commit)
       via  d4510e53d8dd18ac397ca0d4df74d4de682e0a38 (commit)
       via  9ab7a2df030fe3eb7b82a99d9f17093c0036bc06 (commit)
       via  30e61500e162453d7affd855fe531ed2d1d6e80b (commit)
       via  34010bcc91bc2e8503e7b80187c1aea0e51e53b0 (commit)
       via  d4e93864b8f05f8973d291ac287b27febbb5cb62 (commit)
       via  a01816da59cd7a18fca281ef94a822f08cec5c6e (commit)
       via  4f9dcdc35b277aa1ded60059a654da22d2075067 (commit)
       via  0dfbe9cdd7e076fb23d90e99e225fd0e19b63dfb (commit)
       via  6c56e0e1fb8556593c7070cb031449cc8f404940 (commit)
       via  d06f4edb146cfb42fa2a3f654db141f88dcfe074 (commit)
       via  e57f1b702e9e38e78fc0e0be7b968d7ae4939c4d (commit)
       via  fe7e01c834b1f1c423faee212944cbaf220d7ed9 (commit)
       via  c30fe8fd7cf25f620cf3480416a514172edef0bf (commit)
       via  1b359bc88e4f98f9aab454c270684172ae0e46ca (commit)
       via  1e2907f170116138b1ae304dc075ee52e377fd73 (commit)
       via  2217158c3774ca3bb2b66af2b86f7fc8212c2465 (commit)
       via  53784e786da69296020914c508905a9cf14b490d (commit)
       via  d0c7ef43585e96f523ad85c55cdc219e9c8bac95 (commit)
       via  2ec318640f7940071618ab7f6bd980eee0479195 (commit)
       via  bb57c30a537f2ae01a146dd697ca332f7667c5c5 (commit)
       via  b453b0e2e1c82e6d08180c341989d6d0c05f21fa (commit)
       via  9ec2b1c83f3390dac2e5e7d3aa21ff4920f29243 (commit)
       via  280bf89bd4a6bb7977abb00b88d59234d2c80844 (commit)
       via  c95e66120be049ee51ff84868b1da3379b312fab (commit)
       via  b539b6132141b0f583076355ad158852667b79cd (commit)
       via  4978953c7962f33fa1eddbe75e5ef3736fbe7f06 (commit)
       via  b6fb0940c226373ac235a5d327d3fcfd742bc6b9 (commit)
       via  2bda1a9502206ca2b7b35e39c82356f91de06914 (commit)
       via  94994b13c51e076a4df069d550ec2f27550f6a28 (commit)
       via  78fa5060593b9a419281230a264eb1180c9ed2b2 (commit)
       via  f0d76d526b0d37f36085d58b0c5c8cb9d9d9d7c9 (commit)
       via  2005de48f9b87de6fffb792a6b16a880e92e3d82 (commit)
       via  282cdc8b5c2495195fab8ee4afa9a7903caa459e (commit)
       via  c6b36e5498cf6593daf001123cacec4ccaf305ca (commit)
       via  e469d78d33feff45f16235871ca1a3d483cdc950 (commit)
       via  476248befe2bd04558ce53e937230c1a400a51b6 (commit)
       via  fbfe2a58de8a9ca31164b4c6f26191b851fe939d (commit)
       via  03b3fed8f1dcd5df5049b9236cfaa60a17e56e6f (commit)
       via  ac315792bfccd547e6f84faabbb76c48af48a404 (commit)
       via  60b8e1f5243dfc3233d38700755a06c38b4967f1 (commit)
       via  cddab021e392ed78b5375ef6924bc7d4dbdd01c0 (commit)
       via  c60bdcf8a80b7307add8e09aca2356591c86fbcd (commit)
       via  2708d7f7005c6a65980f5eb0377a9fd7917bce51 (commit)
       via  a6c38f2f648f91f35594383666eec01abdc19632 (commit)
       via  2225b9bdb08228fc824e9011341e8c0916fe2e07 (commit)
       via  fd59f19cd2388519265dfba3d28e5281df6f4ba0 (commit)
       via  88c0a7463328ef47106ea0afbeb148ebd4e6d067 (commit)
       via  6e92968d751ce3006b5ca0fc59eced20c94dc507 (commit)
       via  2f8fc325aca43693aac368ae5781547cc976d387 (commit)
       via  0c78c766e4cb8ffcda44cabfadb8de8e09121034 (commit)
       via  5976a6a75cfa6749db306111a601d99c99cc00a4 (commit)
       via  4b6b0fd526b16d70bb5d1acc8d93af280660c810 (commit)
       via  bdfd5d95c5543154f7af17f0c001dc2b7044c1c4 (commit)
       via  126673261de0dc5d64b05e3f76ced6801c28fffb (commit)
       via  0910d9d4d68a3757f8777974ead2e4e34f48433e (commit)
       via  c57b3b1d2c4344603763c8d200f111a132d3899f (commit)
       via  6dd3c0ed962dd3c2d4db331d4c745b39b7dde8c3 (commit)
       via  16cc362f0ba9fb240f3d47f06e74ac215c4d6c27 (commit)
       via  c11a33fe76123abb19cfc1da7d3701a44fca2f23 (commit)
       via  d5aa42166152c4817d4fb06f183552efc135304b (commit)
       via  405ee871c54d78e63cef1a570578a755250102c8 (commit)
       via  0de02f1716edc16257339af78f198072da87539f (commit)
       via  d8529d9b008ede05165317b8ebb834525fd9835c (commit)
       via  5e075fb80968744c72dfaba062e0b591ac69fad0 (commit)
       via  ba50c3fed38283968f622d7f47437f56033f09b7 (commit)
       via  791c95230cd399eaa5892d6e13d3ce08e6167e0c (commit)
       via  896c0cc8ec3c9489ba36876b8b580dedf85811c8 (commit)
       via  a2e6beade196aef269bda6bb3efb68809f85a683 (commit)
       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)
       via  e6cd9d88d345b998f8623f0f92c3c4cea8e66f54 (commit)
       via  0639998ee8750083b5e4ad90371c475cb2cca88f (commit)
       via  d6333af7e9b01d0e878ddbb92b5f972c67f5350f (commit)
       via  9aa62c723807f569c55a8e0df069cb2eadad77ae (commit)
       via  76f32499d20ac9ee12a1b7aafbd2493749364a86 (commit)
       via  a0bc6d2fb21e47c5e659bc113c0c47b2288a9898 (commit)
       via  73af48fff5502bc156160ce74896ffd156ee08ee (commit)
       via  c9d5d11d2da77fada77dca1e239accd126fa3300 (commit)
       via  412c850eaba82a06532fcb6300234a63e7ae037b (commit)
       via  350c80fa99c759d3080d3c3876e525ae130d1b04 (commit)
       via  e1bffd03188479f85f09eba2b478d36d77a70264 (commit)
       via  10e0a36a496a7032b15728343cf8ee2ca2df5cb3 (commit)
       via  375656440bd03d229701a1c97ef3f2ac61ba6712 (commit)
       via  ade508312c701ce89d3c2cd717994dbbabb4f207 (commit)
       via  c807c1a23fc918591e9d2f6f26c4e071a725bced (commit)
       via  e0f160663e50d0481afd8a9e1ec90c334be489e1 (commit)
       via  bff695b926249ead1944eef2aa05b2e0eaf9ba7f (commit)
       via  6ca948a303e1af7ae66ea7082af741f6880887f2 (commit)
       via  19ad9cf7741c641bd83d20485b32d11fe27ca8df (commit)
       via  450136d368ce7a08cf25992c79b51f51f8a9bb7c (commit)
       via  57e222d6e5ef5744491d093475e1136aedf81810 (commit)
       via  4b7d301c94d33394550322768a9d2232087b2d64 (commit)
       via  f86baae1a7092533c7c3d56846e7bae97590951b (commit)
       via  de3fc8b1c47eaa87917e1886d4a0988327438038 (commit)
       via  c5b7a1ee3cae26854c6a489ee2977e4134efabfd (commit)
       via  8d70181b031d7557dd4083dc041cc7c658fddfc4 (commit)
       via  d09aa2138bdedf32569844fa14cf88f28d41020a (commit)
       via  9ef4126d48153d4754b29bd4231d29dfb15fa73f (commit)
       via  0cc8ed5cccd3073670f3b77189177d44eae9b099 (commit)
       via  e000f2ab6e8491bf8175c38c42fabb04833d5209 (commit)
       via  2a4d1085cb9d2d03e6aeb2c71a59888826c31afd (commit)
       via  738d811b04ab1c3f5315e7bf8b7d0bc553dea501 (commit)
       via  2d709fe2721e6e7f8c33e2973e623fcf44b19efe (commit)
       via  5dbbde5b222204fa8dfc086b88a8105516f7d727 (commit)
       via  d368eed9c78aa3ced8540c66bdc4c5e1d4a067b4 (commit)
       via  0dbd5c864047ad2ad3d459493c9e82be57427f83 (commit)
       via  86bd98c6aa0d1a8533699af911c7c40c549b3965 (commit)
       via  0449bab2f8722f277213e44da13de6a0b5ae7b5b (commit)
       via  d4e1d85dba8ec4a37f68a284b5a2be15b4f2987a (commit)
       via  a638676473bd7bf2d47275ed2fd708e5b9d47e0b (commit)
       via  c50ffc4cb89b67ae59208eb72cdb664c846ba987 (commit)
       via  990e010394a2685c1daeaef61cf4f7e2a0ba419e (commit)
       via  b4e75d6c41b2561ca86321fb775ca774c8af44eb (commit)
       via  45668806567c0f31479c8bf9b1a85930cac70c5d (commit)
       via  6a3fac871104c5cf3cd1c6a7767ba66d10446475 (commit)
       via  9508293e0186ded3be212a377b1fe39d68070da7 (commit)
       via  5b5c9315275752add1215dba0f86d5f5068d856b (commit)
       via  12a317b93a635a623a8d0b9d0cb200ba8b3ae98b (commit)
       via  a6464b3cb08b86d5fc537a4907849546a63ae4da (commit)
       via  df8134c3cf53a2e4363f27e9a1266e685ca7f0e7 (commit)
       via  e8c2b9967f22a672753b2662f7858734ec328b06 (commit)
       via  ec813878e4889be97535cf01bd2b49fd09467a47 (commit)
       via  3d1528027889d67ca98002833dcb42b3f2f48067 (commit)
       via  53a7ccc08b286a02f5a276f213cfae31c8e6bf7c (commit)
       via  1da094c9adf49c48a8b61ee7ab5336e8ba3f9e8d (commit)
       via  49c30ce958e5e95e9e6ab79d2308751705d0ff22 (commit)
       via  dc24fb51a31de8443e653655105d4e1c88847bcc (commit)
       via  df43fb661b2030d9b833a42dd47b8d7bf58d73aa (commit)
       via  40db59038cc62a5a8e4f94cb069eeb1d9b95a1a9 (commit)
       via  20baf128ef39dca058636c1bff4c526a8879b3d5 (commit)
       via  38c5b148531b1f470956bb9d66757e7301ce0535 (commit)
       via  8eee0146f28285bdc778051afd89088685f2c3b6 (commit)
       via  9f948b8c335b099b305b55a2c176841a0354cdad (commit)
       via  c5e2b850ad53fcd1af62c838f8ee288e8ea9fb3d (commit)
       via  7f747204ea3b61e507b8bd48f33e8dd83f34705b (commit)
       via  1562dd2c26d43bffa8c6bd08ec6128c750ad58ff (commit)
       via  fa465fb2b1ce4119e4ae8f9b64721f385f361ad9 (commit)
       via  cba14d85a854df8b5f24342c072acf21813761b6 (commit)
       via  171ba1d0d154f7fdeb712fd411f19e1ebddd3b55 (commit)
       via  06e2e1b87ce7db9f48b9d198d71d46636f7e6fe3 (commit)
       via  50f7e6fb5f0754093e11b781b916034001d44a09 (commit)
       via  e14ebbce41c8acee5f77633c6c536d92f84a5c20 (commit)
       via  17adf04e5c1da72a51815f3fdb9de2f3a8149c1a (commit)
       via  7d016b76e22c0911f9a5ee024a2849096661ddd7 (commit)
       via  113f5b14cbab2d62d5ca470f4b1f82989d3a50fe (commit)
       via  cc77e8f1131fc66e8405dc4d3b03582db1f54ca4 (commit)
       via  297e16cc7acc45b7946e03febd370ecba7835750 (commit)
       via  a2b73c74b0843aabea629e2c7ec7f359ddd47caf (commit)
       via  e6a0609f2efff83e58ddd7eb1d2c8e1ac47d9f6d (commit)
       via  00994ac08cb84937ca1e35b7a556d8924229bacb (commit)
       via  2ed0f7278e389ecc0cf568518799a9a8f33b1365 (commit)
       via  66a49df9cba8f17059be420126346a4234e81cba (commit)
       via  697680d687544c4495f05d5baa83659fb877477b (commit)
       via  3816ae9ce835691e690d68f37ff6b01207068870 (commit)
       via  1f420b008bd4bc7b5fe7809e7f7506ef5dcb7209 (commit)
       via  66a5562ce2906fbf5b96d1cee18f9a31a78c4360 (commit)
       via  2fa2dd3908c783663ca421134cde82e9b6a38a0d (commit)
       via  a7016949f27f7612ffba7a4d0c5e6280cb3e66ba (commit)
       via  2f0a75f0040b0de339c78448844a7b18ab995c46 (commit)
       via  acb47dee69a165f242d88f9eac60fc5646e33410 (commit)
       via  63503f284863530d628f26bea27f2390aca518e5 (commit)
       via  b79a769b2d878d6e8e55f675209ffa7f3f2a6f68 (commit)
       via  4ef195a36946c8d587d129abd54683c73eecc304 (commit)
       via  0f07e0aea3c5eb5bfb307aa50e04f088b889ddfc (commit)
       via  a03e261193bdee1ae1cf3e12af3455cbf085fcc7 (commit)
       via  d3eb5df259698c6f4080f3e988fbdaaba9698636 (commit)
       via  97709950e794ab24d3e1d5411a88e305f3878487 (commit)
       via  37924cf175b5f61ca85dab685ec5d7879519ebc4 (commit)
       via  cea4f1464b00e025859b3b5dc415ce135afebd92 (commit)
       via  026ef8111a94f6449dfa5e5cc0ae91fca4e68c0c (commit)
       via  e081603850cb4e3839a76f0bfbb90cff922dff03 (commit)
       via  568d369d7747c6cc2a421a816c85d888ccfc9957 (commit)
       via  92a0e93ac33ceb64a4e7e930223950d4529cef37 (commit)
       via  ae09292a6e659eabc566a0fc2b1f6fa5e5fd8b36 (commit)
       via  9a82fde43aaaeab4370126d549aee8061b3a6937 (commit)
       via  9e7ae34da5aeb9a38c3f4280f6d9648faad48df5 (commit)
       via  a94cd0d77407a8cf5c151e1f5135eba5d11fdb2b (commit)
       via  d5448ceb956d1884bf7aac4667b79a0905fa4166 (commit)
       via  e61dadf3de3084157f25ce0fbcc07990bb44aae5 (commit)
       via  2bd26f4afa4f87d3dd2a8b9715455fc3f5a05046 (commit)
       via  e3721a3b3fca5ad7d957ae95252405da0740fbf6 (commit)
       via  831fc138c1617f5cb49da589ea5126c8eda364a4 (commit)
       via  28904e54d2a1bae009cbb88088b81e8d5bbd15d5 (commit)
       via  de9c1c3627de778671c0fa1215a2c5e24d4374dc (commit)
       via  fbab11e9b08d107b04d53833286da1c1487c2708 (commit)
       via  6864220c28c95991cf9577892156d670bd184007 (commit)
       via  3b7c5bfb98cd4d3b675ac39ec62d0fa71a66a6dd (commit)
       via  6443da0865a6ad8bdd7abc65a9621ba329fcb756 (commit)
       via  c07534dc719f53c0e59d59f3bd7dd25d1d32747c (commit)
       via  c0cb9bc84c1997d790d0b7efa8ed94fc601d7d19 (commit)
       via  a453b3154e063c3e934cb90a546e984a758dd14f (commit)
       via  ed1584aed892e9004a96b915c12a1adbc6b419f0 (commit)
       via  5a143e91dcaf64d77694b85671c214f93e3e8512 (commit)
       via  8aa98a409b16cfd1a035c3f60208207eb1cc4d41 (commit)
       via  b15c49e59bdc149b978d2b35a4efcc99d15f16b2 (commit)
       via  029cb1fd0f576dd7587bc306b126318fbfcdde2d (commit)
       via  b5246de562706aa2f423edaa060f4530da84f3a0 (commit)
       via  6e96ea535a8fe4d2487fed27c06feaeef449470d (commit)
       via  c02d1863d1bfa87c8c4fdd0c36f90245613d5bbd (commit)
       via  d06e61aa80fcf6d9681d5112f0625b1602975aed (commit)
       via  a3996ba2d1b43795c289d3e59e561e4fc84d9b7e (commit)
       via  8e33a83b6820af84862c45c30829a8ef52578743 (commit)
       via  70335540c68a35121979ac63d976fb5edc1d68ca (commit)
       via  14c3bdb3f7de153d93eda13980275d2840d62016 (commit)
       via  e46c3d7bcf000803e2a7d7339fe36db4fb97cf62 (commit)
       via  99e75135ee5437e47bb64983dbb2deaef131f2d6 (commit)
       via  9d9f66cc8d57dc16bb94c092b3821b56afce6cab (commit)
       via  a87914993d2d4a5ed32adfe16e2a2ac006d997c0 (commit)
       via  55418dc87d132875feb50c2bd9531b5f5ed13334 (commit)
       via  2ffa112ed32cf8123e5177a0fe2c12130c6f78c7 (commit)
       via  cd66f0e2d9e79b03b4773ccacf758fd3d141ccab (commit)
       via  1226aba119c46c09ec6620dc0be29b63fb3440a7 (commit)
       via  25d9f2dd247f9d9cc4bb18032d10542fd67ccea2 (commit)
       via  734ef96d5f7dae620115f328296d7e560e624042 (commit)
       via  db1fc51ccc24745e83bd2f635bed97787873341b (commit)
       via  45077fc3232eebf2b657c552afa92b24e4770bb0 (commit)
       via  279ea105d8e91aa922ad946b66ee076e5e7e21c7 (commit)
       via  f25b37c1da2c9f1109b9169b89216c2be4750f98 (commit)
       via  44791e2d78f894e62ab00b85277ee3ad4515519f (commit)
       via  eff6f1203222a776c5990b5d104b57a7f69b9aab (commit)
       via  09df5eaff2ba2694b82d1211fd24410cb2997e25 (commit)
       via  9566cf0e2f326d8fe638748d0bc10626e8c0387e (commit)
       via  4feac4e40e08d95c4549ef28ad89cc4d3d8f74a7 (commit)
       via  583ed4bde3aa450f049ad893820aece9fb6b1a9a (commit)
       via  3eb8e5871f3b3e572ae5e281f55fb7282c82c47e (commit)
       via  ed18005a9940c26cafa5ed8ccadc46e2fbe63f9e (commit)
       via  d019f101e840e20b0f47799c17336599d829ae54 (commit)
       via  2b8e422b3173388075b010f10e935c735edcd9a1 (commit)
       via  9e6e4ae49a49c60f9b15d9276a44a1ad25865c81 (commit)
       via  57028236c8b6ab0a56cba3a504d1d8ff12ab6c0d (commit)
       via  1c71ec4d45a8da2a5c83b09e2e39d4a7c2ecc99b (commit)
       via  5da8289e9cc086ac9c010ee41d0c06161c240dbd (commit)
      from  4b5b008d54e86ac4f0a2176429d062100978ca8c (commit)


- Commits -----------------------------------------------
commit dbf3c5247c90bd35c0b2002e3b972a2dd4c8b130
Merge: 4b5b008d54e86ac4f0a2176429d062100978ca8c 0b734bd7cf921592eee441f759687e10f48a2cbc
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Jun 3 22:56:25 2008 -0700

    Merge commit 'origin/master' into drm-gem
    
    Conflicts:
    
    	src/mesa/drivers/dri/common/dri_bufmgr.h
    	src/mesa/drivers/dri/intel/intel_bufmgr_ttm.c
    	src/mesa/drivers/dri/intel/intel_bufmgr_ttm.h
    	src/mesa/drivers/dri/intel/intel_ioctl.c

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




More information about the mesa-commit mailing list