Mesa (master): r300g: import the last bits of libdrm and cleanup the whole thing

Marek Olšák mareko at kemper.freedesktop.org
Fri Feb 11 00:09:59 UTC 2011


Module: Mesa
Branch: master
Commit: 6ccab620a0e7364ab6c0d902b3ddf58ee988f7fa
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6ccab620a0e7364ab6c0d902b3ddf58ee988f7fa

Author: Marek Olšák <maraeo at gmail.com>
Date:   Thu Dec 23 19:40:54 2010 +1000

r300g: import the last bits of libdrm and cleanup the whole thing

Based on Dave's branch.

The majority of this commit is a cleanup, mainly renaming things.
There wasn't much code to import, just ioctl calls.

Also done:
- implemented unsynchronized bo_map (important optimization!)
- radeon_bo_is_referenced_by_cs is no longer a refcount hack
- dropped the libdrm_radeon dependency

I'm surprised that this has resulted in less code in the end.

---

 src/gallium/drivers/r300/r300_context.c            |    6 +-
 src/gallium/drivers/r300/r300_context.h            |   13 +-
 src/gallium/drivers/r300/r300_query.c              |    9 +-
 src/gallium/drivers/r300/r300_render.c             |   40 +-
 src/gallium/drivers/r300/r300_resource.c           |    2 +-
 src/gallium/drivers/r300/r300_screen_buffer.c      |   18 +-
 src/gallium/drivers/r300/r300_screen_buffer.h      |    3 +-
 src/gallium/drivers/r300/r300_state.c              |    8 +-
 src/gallium/drivers/r300/r300_texture.c            |   19 +-
 src/gallium/drivers/r300/r300_transfer.c           |   15 +-
 src/gallium/drivers/r300/r300_winsys.h             |   78 +--
 src/gallium/targets/dri-r300/Makefile              |    2 -
 src/gallium/targets/dri-r300/SConscript            |    2 -
 src/gallium/targets/dri-r600/SConscript            |    2 -
 src/gallium/targets/egl-static/SConscript          |    1 -
 src/gallium/targets/egl/Makefile                   |    2 +-
 src/gallium/targets/xorg-radeon/Makefile           |    2 +-
 src/gallium/winsys/radeon/drm/Makefile             |    5 +-
 src/gallium/winsys/radeon/drm/SConscript           |    3 +-
 src/gallium/winsys/radeon/drm/radeon_drm_bo.c      |  543 ++++++++++++++++++++
 .../drm/{radeon_drm_buffer.h => radeon_drm_bo.h}   |   45 ++-
 src/gallium/winsys/radeon/drm/radeon_drm_buffer.c  |  535 -------------------
 src/gallium/winsys/radeon/drm/radeon_drm_common.c  |   58 ++-
 src/gallium/winsys/radeon/drm/radeon_drm_cs.c      |   27 +-
 src/gallium/winsys/radeon/drm/radeon_drm_cs.h      |   15 +-
 src/gallium/winsys/radeon/drm/radeon_r300.c        |  181 -------
 src/gallium/winsys/radeon/drm/radeon_winsys.h      |    3 -
 27 files changed, 737 insertions(+), 900 deletions(-)

Diff:   http://cgit.freedesktop.org/mesa/mesa/diff/?id=6ccab620a0e7364ab6c0d902b3ddf58ee988f7fa



More information about the mesa-commit mailing list