mesa: Changes to 'master'

Eric Anholt anholt at kemper.freedesktop.org
Fri Aug 8 23:02: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/Makefile.template            |    5 -
 src/mesa/drivers/dri/common/dri_bufmgr.c          |  160 ---
 src/mesa/drivers/dri/common/dri_bufmgr.h          |  260 -----
 src/mesa/drivers/dri/common/dri_bufmgr_fake.c     | 1245 ---------------------
 src/mesa/drivers/dri/common/spantmp2.h            |   60 +-
 src/mesa/drivers/dri/i915/Makefile                |    7 +-
 src/mesa/drivers/dri/i915/i830_context.c          |    3 +
 src/mesa/drivers/dri/i915/i830_reg.h              |    8 -
 src/mesa/drivers/dri/i915/i830_vtbl.c             |   28 +-
 src/mesa/drivers/dri/i915/i915_context.c          |    3 +
 src/mesa/drivers/dri/i915/i915_reg.h              |  118 --
 src/mesa/drivers/dri/i915/i915_vtbl.c             |   40 +-
 src/mesa/drivers/dri/i915/intel_bufmgr_ttm.c      |    1 -
 src/mesa/drivers/dri/i915/intel_pixel_read.c      |   13 +-
 src/mesa/drivers/dri/i915/intel_render.c          |   13 +-
 src/mesa/drivers/dri/i915/intel_tris.c            |  237 +++--
 src/mesa/drivers/dri/i915/intel_tris.h            |   14 +-
 src/mesa/drivers/dri/i965/Makefile                |    2 -
 src/mesa/drivers/dri/i965/brw_cc.c                |   19 +-
 src/mesa/drivers/dri/i965/brw_clip.c              |    4 +-
 src/mesa/drivers/dri/i965/brw_clip_state.c        |   17 +-
 src/mesa/drivers/dri/i965/brw_context.c           |    1 -
 src/mesa/drivers/dri/i965/brw_context.h           |   19 +-
 src/mesa/drivers/dri/i965/brw_curbe.c             |   41 +-
 src/mesa/drivers/dri/i965/brw_defines.h           |   64 --
 src/mesa/drivers/dri/i965/brw_draw.c              |   72 +-
 src/mesa/drivers/dri/i965/brw_draw.h              |   23 -
 src/mesa/drivers/dri/i965/brw_draw_upload.c       |  113 +-
 src/mesa/drivers/dri/i965/brw_fallback.c          |    3 +-
 src/mesa/drivers/dri/i965/brw_gs.c                |    7 +-
 src/mesa/drivers/dri/i965/brw_gs_state.c          |   13 +-
 src/mesa/drivers/dri/i965/brw_misc_state.c        |  118 +--
 src/mesa/drivers/dri/i965/brw_sf.c                |    3 +-
 src/mesa/drivers/dri/i965/brw_sf_state.c          |   36 +-
 src/mesa/drivers/dri/i965/brw_state.h             |    3 +
 src/mesa/drivers/dri/i965/brw_state_cache.c       |    5 +-
 src/mesa/drivers/dri/i965/brw_state_upload.c      |   40 +-
 src/mesa/drivers/dri/i965/brw_urb.c               |   15 +-
 src/mesa/drivers/dri/i965/brw_vs.c                |    3 +-
 src/mesa/drivers/dri/i965/brw_vs_constval.c       |    3 +-
 src/mesa/drivers/dri/i965/brw_vs_state.c          |   13 +-
 src/mesa/drivers/dri/i965/brw_vs_tnl.c            |   10 +-
 src/mesa/drivers/dri/i965/brw_wm.c                |    4 +-
 src/mesa/drivers/dri/i965/brw_wm_sampler_state.c  |   22 +-
 src/mesa/drivers/dri/i965/brw_wm_state.c          |   41 +-
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c  |  165 ++--
 src/mesa/drivers/dri/i965/intel_bufmgr_ttm.c      |    1 -
 src/mesa/drivers/dri/intel/intel_batchbuffer.c    |  134 ++-
 src/mesa/drivers/dri/intel/intel_batchbuffer.h    |   24 +-
 src/mesa/drivers/dri/intel/intel_blit.c           |  113 +-
 src/mesa/drivers/dri/intel/intel_blit.h           |    8 +-
 src/mesa/drivers/dri/intel/intel_buffer_objects.c |    4 +-
 src/mesa/drivers/dri/intel/intel_buffers.c        |    2 +
 src/mesa/drivers/dri/intel/intel_bufmgr_ttm.c     | 1122 -------------------
 src/mesa/drivers/dri/intel/intel_bufmgr_ttm.h     |   28 -
 src/mesa/drivers/dri/intel/intel_context.c        |  111 +-
 src/mesa/drivers/dri/intel/intel_context.h        |   14 +-
 src/mesa/drivers/dri/intel/intel_decode.c         |   22 +-
 src/mesa/drivers/dri/intel/intel_depthstencil.c   |   80 +-
 src/mesa/drivers/dri/intel/intel_fbo.c            |   20 +-
 src/mesa/drivers/dri/intel/intel_fbo.h            |    6 +-
 src/mesa/drivers/dri/intel/intel_ioctl.c          |   82 +-
 src/mesa/drivers/dri/intel/intel_ioctl.h          |   16 +-
 src/mesa/drivers/dri/intel/intel_pixel_bitmap.c   |    7 +-
 src/mesa/drivers/dri/intel/intel_pixel_copy.c     |   10 +-
 src/mesa/drivers/dri/intel/intel_pixel_draw.c     |   16 +-
 src/mesa/drivers/dri/intel/intel_reg.h            |  129 +++
 src/mesa/drivers/dri/intel/intel_regions.c        |  162 ++-
 src/mesa/drivers/dri/intel/intel_regions.h        |   13 +-
 src/mesa/drivers/dri/intel/intel_screen.c         |  115 +--
 src/mesa/drivers/dri/intel/intel_screen.h         |    2 +
 src/mesa/drivers/dri/intel/intel_span.c           |  676 +++++++++---
 src/mesa/drivers/dri/intel/intel_span.h           |    6 +-
 src/mesa/drivers/dri/intel/intel_tex_copy.c       |    6 +-
 src/mesa/drivers/dri/intel/intel_tex_image.c      |   23 +-
 src/mesa/drivers/dri/intel/intel_tex_validate.c   |   14 -
 76 files changed, 1748 insertions(+), 4312 deletions(-)
 delete mode 100644 src/mesa/drivers/dri/common/dri_bufmgr.c
 delete mode 100644 src/mesa/drivers/dri/common/dri_bufmgr.h
 delete mode 100644 src/mesa/drivers/dri/common/dri_bufmgr_fake.c
 delete mode 120000 src/mesa/drivers/dri/i915/intel_bufmgr_ttm.c
 delete mode 120000 src/mesa/drivers/dri/i965/intel_bufmgr_ttm.c
 delete mode 100644 src/mesa/drivers/dri/intel/intel_bufmgr_ttm.c
 delete mode 100644 src/mesa/drivers/dri/intel/intel_bufmgr_ttm.h

       via  53675e5c05c0598b7ea206d5c27dbcae786a2c03 (commit)
       via  d2796939f18815935c8fe1effb01fa9765d6c7d8 (commit)
       via  527e1cf172cb0a4d1f2891a351498669be1620cd (commit)
       via  ded9414024ef7b2fb1d991d872c56c0d85e9ce1f (commit)
       via  c9120a0d1928f8ca6114923fd307fbc5c358eb0b (commit)
       via  902e401a384a8213d1239aae42bc2b7071ad6bd8 (commit)
       via  1e645b365900cf1c71ca5594bd6b549a1f203040 (commit)
       via  e5022c3fdf9888857f22f9a1690035ff3f90d36b (commit)
       via  ff60e3fa031504b403766324b1fae3ccacec6650 (commit)
       via  2e3714380027252ba17a11f23eae851d3f77ab02 (commit)
       via  d2d5abfaeb46fc7b4d4267a6c9e92420fc9b5334 (commit)
       via  f0ca917924a749b1fa287cc9536607ace03c2f89 (commit)
       via  1c8791c581ba2e3906a98a74e998dd51dd474ddb (commit)
       via  bdaa06ad639821368ac8d1af7b7561fd7e83fb13 (commit)
       via  99fe0c222c2853a612b73aa6fcffb0a532ce5747 (commit)
       via  442c195c4afce2509130a718c44a69a5b009979e (commit)
       via  a5f02368d2a9ab1f814eba2c997729c6c655fc5e (commit)
       via  946abd9b5a55f999ef21f807769f5fb81b10a426 (commit)
       via  2e841880cfc1006a2818d4a8bfefd21136dc39a9 (commit)
       via  def6e4f420feed4a07402a8da84e7822f6ddba99 (commit)
       via  a995bdced20a55759dffd901c10ec5fb251191cf (commit)
       via  4b3ed4d2d16811a624857519e95303017f4160b5 (commit)
       via  19f585a3cf65887e249d630fe43e83e7e7618dfa (commit)
       via  e74f54793e45dd2e36474f6fc527456647f32efd (commit)
       via  f059a3302260075e9cfd35649dc3877726291d8d (commit)
       via  93f701bc3619864ac6f067d37212e96545a57e16 (commit)
       via  f6abe8f0f2fba3073b58b96ed38aae163c765b4a (commit)
       via  a42dac187973cbc17be6c59db89264cbc935ab91 (commit)
       via  62d66caeba786f01f6159c980fda79606afe4c61 (commit)
       via  0da9bc6a69fbd287f2e87ca9f868cb4ccc47735a (commit)
       via  bbe80af457316826f56ada767d26e8c1db7f1130 (commit)
       via  654258a4fe5e7114022c6e02f2844fc469fcc6f3 (commit)
       via  64adeb163d7da6d75b5664cd2ee3783cadaf63d8 (commit)
       via  e2baf564d1b9716611d194cf117b329a92ad603d (commit)
       via  407ce3da3c53c9ebba0fbf827d7b0f610122d44b (commit)
       via  0227d91a9e3cf65aae3266d100eebd3459dff4c3 (commit)
       via  f5d03af109e0c6fdd7cc6786f8ae40f8ae626f5a (commit)
       via  dbf3c5247c90bd35c0b2002e3b972a2dd4c8b130 (commit)
       via  4b5b008d54e86ac4f0a2176429d062100978ca8c (commit)
       via  fccc427aac17b3fa17160332e6e6f3c2cef25ca5 (commit)
       via  d8395f9d9eed4040d6fa12f1631dd7c372c73be4 (commit)
       via  924eaa2f955ecdc1080f5a8fdc165367a576a919 (commit)
       via  8ba91b4636a04145e683e7d7fe5ee5ff404d73ac (commit)
       via  200fd13d4a605bea07857d6c3e7c85ee07d663cb (commit)
       via  a74bf4ef345d880d7d296313fed0240781d2ebd8 (commit)
       via  6cefae5354fb3015c5a14677071871613faa9c3a (commit)
       via  76286bc76c5ea2217378809a9dcab6794aae7b5e (commit)
       via  8b49cc104dd556218fc769178b96f4a8a428d057 (commit)
       via  cba90d4a778ab5202f2f7547ad7ffeb84216d07b (commit)
       via  145523ba3acb95a9ff390430a9e0a3fa958cae1b (commit)
       via  0cb006c1fdb75e1fe282120cc5455a4e8c59b1a7 (commit)
       via  fda5687241f4ce5cab3bf2eac437b52d4b37dd10 (commit)
       via  68a916183276f727948e73fe752ebf36ef9f8ba9 (commit)
       via  ead798eb103e4cfe801704bc15eb4fe8df078fa8 (commit)
       via  ab50ddaa9173ae108833db0edb209045788efc41 (commit)
       via  8b2a7f08bc446deef497f2a0d3b54d9b70bdaf9c (commit)
       via  c75b2d74d88e9926cbd10aa1eee4aeba93ba4850 (commit)
       via  a2ec8570aeb838700fa97b8c5ba6d9d383e5606e (commit)
       via  42d4f89264f193e8beae7ba975df3507b81b6da0 (commit)
       via  96f52f089f42b4bca8fa5fb573c687d233851126 (commit)
       via  537bbe6dec780f6f85838fe7e6036579c509f8a6 (commit)
       via  df4b49c2cedde60c02f869977ee426f280b2985b (commit)
       via  e9a2a67745d46509928263f0556f5c0a4211b94f (commit)
       via  1decab06d15f0dead0a544dbed2f10041caac844 (commit)
       via  01d1a292bf53ab949cf2075f18986b58fa468a61 (commit)
       via  be59d52ca0c0a5b93963297d596972fccb792b69 (commit)
       via  5290ec4756eb33ec27e06bb68d64c33472276ac3 (commit)
       via  1f810b85b1e9393c8e606d2f28250cbb19cf916b (commit)
       via  87ccc03736166db9ef85f3eee3723b82f395d3cf (commit)
       via  367b1e35dc1dbeda65709b0ab4f7983d0c7a6cc2 (commit)
       via  81ec0545c93d57f72cff5099c6a34f04e9257a38 (commit)
       via  3d19a095cda30ac8abdbe26cd3b664a4b97c899b (commit)
       via  7349f218b47b21595a13103aaa45ddbfdc14dd13 (commit)
       via  ef33e76cebed39551aabce397d165d3990ba517c (commit)
       via  eb10cdc838fc31ea2cf59f556f6f7d8b072f5bae (commit)
       via  89bba44e969f15bf20da6d700c493237b095a588 (commit)
      from  501338d70e96e0388fd5198625d856c4ec07745f (commit)


- Commits -----------------------------------------------
commit 53675e5c05c0598b7ea206d5c27dbcae786a2c03
Merge: 501338d70e96e0388fd5198625d856c4ec07745f d2796939f18815935c8fe1effb01fa9765d6c7d8
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Aug 8 15:32:24 2008 -0700

    Merge branch 'drm-gem'
    
    Conflicts:
    
    	src/mesa/drivers/dri/intel/intel_span.c
    	src/mesa/main/fbobject.c
    
    This converts the i915 driver to use the GEM interfaces for object management.

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




More information about the mesa-commit mailing list