[Mesa-dev] DRI1 Cleanup

Kristian Høgsberg krh at bitplanet.net
Mon Oct 31 07:58:13 PDT 2011


2011/10/28 Kristian Høgsberg <krh at bitplanet.net>:
> Hello,
>
> Here's a follow-up series to Eric's removal of the last DRI1 driver.
> Now that all DRI drivers are DRI2-only, there's a lot of DRI1 driver
> infrastructure that we can remove.

I'll merge this in a day or two if there are no objections.  Some of
the concerns that came up in IRC was about leaving the DRI1 loader
capability in place: that's still there, this patch set only removes
(no longer used) DRI1 infrastructure from the driver.  The other
question was about the CopySubBuffer removal: this is the DRI1 driver
side CopySubBuffer code that we used to do (with the shared drm lock
and window clip rects from the server etc).  DRI2 implements
CopySubBuffer entirely in the X server.

There are a lot of patches here, but nothing tricky.  It's basically
pulling the loose thread of un-used symbols left by Erics removal of
the last DRI1 driver to see what unravels.

Kristian

> Kristian
>
>  .../state_trackers/dri/common/dri_drawable.c       |    6 +-
>  src/gallium/state_trackers/dri/drm/Makefile        |    4 +-
>  src/gallium/state_trackers/dri/drm/dri2.c          |   30 +-
>  src/gallium/state_trackers/dri/sw/dri_drawable.c   |    6 +-
>  src/gallium/targets/Makefile.dri                   |    4 +-
>  src/mesa/drivers/dri/common/Makefile.sources       |    5 +-
>  src/mesa/drivers/dri/common/dri_util.c             |  577 +--------
>  src/mesa/drivers/dri/common/dri_util.h             |  284 +----
>  src/mesa/drivers/dri/common/drirenderbuffer.c      |  200 ---
>  src/mesa/drivers/dri/common/drirenderbuffer.h      |   71 -
>  src/mesa/drivers/dri/common/memops.h               |   17 -
>  src/mesa/drivers/dri/common/spantmp_common.h       |   11 +-
>  src/mesa/drivers/dri/common/texmem.c               | 1338 --------------------
>  src/mesa/drivers/dri/common/texmem.h               |  330 -----
>  src/mesa/drivers/dri/common/utils.c                |  118 --
>  src/mesa/drivers/dri/common/utils.h                |   25 -
>  src/mesa/drivers/dri/common/vblank.c               |  434 -------
>  src/mesa/drivers/dri/common/vblank.h               |   71 -
>  src/mesa/drivers/dri/i915/i830_state.c             |    2 -
>  src/mesa/drivers/dri/i915/i915_state.c             |    2 -
>  src/mesa/drivers/dri/intel/intel_context.c         |   18 +-
>  src/mesa/drivers/dri/intel/intel_screen.c          |    1 -
>  src/mesa/drivers/dri/nouveau/nouveau_context.c     |    8 +-
>  src/mesa/drivers/dri/r200/r200_context.h           |    1 -
>  src/mesa/drivers/dri/r200/r200_ioctl.c             |    2 -
>  src/mesa/drivers/dri/r200/r200_state.c             |   12 +-
>  src/mesa/drivers/dri/r200/r200_swtcl.c             |    3 +-
>  src/mesa/drivers/dri/r200/r200_tex.c               |    1 -
>  src/mesa/drivers/dri/radeon/radeon_common.c        |    5 -
>  .../drivers/dri/radeon/radeon_common_context.c     |  121 +--
>  .../drivers/dri/radeon/radeon_common_context.h     |    1 -
>  src/mesa/drivers/dri/radeon/radeon_context.h       |    1 -
>  src/mesa/drivers/dri/radeon/radeon_dma.c           |    4 +-
>  src/mesa/drivers/dri/radeon/radeon_fbo.c           |    6 +-
>  src/mesa/drivers/dri/radeon/radeon_ioctl.c         |    2 -
>  src/mesa/drivers/dri/radeon/radeon_screen.c        |   11 -
>  src/mesa/drivers/dri/radeon/radeon_state.c         |   12 +-
>  src/mesa/drivers/dri/radeon/radeon_texture.c       |   78 +-
>  src/mesa/drivers/dri/radeon/radeon_texture.h       |    8 +
>  39 files changed, 135 insertions(+), 3695 deletions(-)
>
>
>


More information about the mesa-dev mailing list