Module: Mesa Branch: master Commit: 6101b6d442b06a347c001fe85848d636ab7df260 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6101b6d442b06a347c001fe85848d636ab7df260
Author: Marek Olšák <mar...@gmail.com> Date: Sun Sep 11 22:24:38 2011 +0200 r600g: merge r600_bo with r600_resource I have moved 'last_flush' and 'binding' from r600_bo to winsys/radeon. The other members are now part of r600_resource. Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> --- src/gallium/drivers/r600/evergreen_state.c | 41 ++---- src/gallium/drivers/r600/r600.h | 59 ++++------ src/gallium/drivers/r600/r600_asm.c | 12 +- src/gallium/drivers/r600/r600_buffer.c | 74 ++++++++---- src/gallium/drivers/r600/r600_pipe.c | 18 ++-- src/gallium/drivers/r600/r600_pipe.h | 15 ++- src/gallium/drivers/r600/r600_resource.h | 11 -- src/gallium/drivers/r600/r600_shader.c | 10 +- src/gallium/drivers/r600/r600_state.c | 38 ++---- src/gallium/drivers/r600/r600_state_common.c | 14 +- src/gallium/drivers/r600/r600_texture.c | 78 +++++++----- src/gallium/winsys/r600/drm/Makefile.sources | 2 - src/gallium/winsys/r600/drm/evergreen_hw_context.c | 7 +- src/gallium/winsys/r600/drm/r600_bo.c | 131 -------------------- src/gallium/winsys/r600/drm/r600_hw_context.c | 83 +++++++------ src/gallium/winsys/r600/drm/r600_priv.h | 18 +-- src/gallium/winsys/radeon/drm/radeon_drm_bo.h | 4 + src/gallium/winsys/radeon/drm/radeon_winsys.h | 10 ++- 18 files changed, 243 insertions(+), 382 deletions(-) Diff: http://cgit.freedesktop.org/mesa/mesa/diff/?id=6101b6d442b06a347c001fe85848d636ab7df260 _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit