Mesa (master): r300g: rebuild winsys/ pipe buffer handling and add buffer map
Dave Airlie
airlied at kemper.freedesktop.org
Mon Feb 22 06:30:46 UTC 2010
Module: Mesa
Branch: master
Commit: fff5be8e7b4557c221f2425dcafc2e7cbbba76ba
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fff5be8e7b4557c221f2425dcafc2e7cbbba76ba
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Feb 12 15:39:51 2010 +1000
r300g: rebuild winsys/pipe buffer handling and add buffer map
This creates a cleaner winsys and drop the simple screen stuff.
It makes r300g use pb_bufmgr structs and adds usage of the cached
bufmgr for vertex/index buffers.
It also avoids mapping too often.
I'm not 100% sure this is perfect but it won't find its own bugs.
Signed-off-by: Dave Airlie <airlied at redhat.com>
---
src/gallium/drivers/r300/Makefile | 1 +
src/gallium/drivers/r300/r300_context.c | 38 ++-
src/gallium/drivers/r300/r300_context.h | 9 +-
src/gallium/drivers/r300/r300_cs.h | 22 +-
src/gallium/drivers/r300/r300_emit.c | 54 ++--
src/gallium/drivers/r300/r300_render.c | 33 ++-
src/gallium/drivers/r300/r300_screen.c | 38 ++-
src/gallium/drivers/r300/r300_screen.h | 2 +-
src/gallium/drivers/r300/r300_screen_buffer.c | 222 ++++++++++++
src/gallium/drivers/r300/r300_screen_buffer.h | 85 +++++
src/gallium/drivers/r300/r300_state.c | 25 ++-
src/gallium/drivers/r300/r300_texture.c | 41 ++-
src/gallium/drivers/r300/r300_texture.h | 4 +-
src/gallium/drivers/r300/r300_winsys.h | 127 +++++++-
src/gallium/winsys/drm/i965/gem/i965_drm_winsys.h | 2 -
src/gallium/winsys/drm/radeon/core/Makefile | 2 +-
src/gallium/winsys/drm/radeon/core/radeon_buffer.h | 60 ++--
src/gallium/winsys/drm/radeon/core/radeon_drm.c | 134 +++-----
src/gallium/winsys/drm/radeon/core/radeon_drm.h | 5 -
.../winsys/drm/radeon/core/radeon_drm_buffer.c | 361 ++++++++++++++++++++
src/gallium/winsys/drm/radeon/core/radeon_r300.c | 237 ++++++++++----
src/gallium/winsys/drm/radeon/core/radeon_r300.h | 6 +-
src/gallium/winsys/drm/radeon/core/radeon_winsys.h | 86 ++---
23 files changed, 1247 insertions(+), 347 deletions(-)
Diff: http://cgit.freedesktop.org/mesa/mesa/diff/?id=fff5be8e7b4557c221f2425dcafc2e7cbbba76ba
More information about the mesa-commit
mailing list