Mesa (master): Revert "r300g: rebuild winsys/ pipe buffer handling and add buffer map"
Dave Airlie
airlied at kemper.freedesktop.org
Mon Feb 22 07:29:54 UTC 2010
Module: Mesa
Branch: master
Commit: b14548ea32000459f4f0c4b49f3fa11d1ee9c003
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b14548ea32000459f4f0c4b49f3fa11d1ee9c003
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Feb 22 17:26:30 2010 +1000
Revert "r300g: rebuild winsys/pipe buffer handling and add buffer map"
This reverts commit fff5be8e7b4557c221f2425dcafc2e7cbbba76ba.
Probably went too soon with this, dileX reported OA not working for him
it works here fine, but the optimisations I wanted aren't working properly
yet so I'll fix that now.
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, 347 insertions(+), 1247 deletions(-)
Diff: http://cgit.freedesktop.org/mesa/mesa/diff/?id=b14548ea32000459f4f0c4b49f3fa11d1ee9c003
More information about the mesa-commit
mailing list