Mesa (master): r300g: consolidate buffers and textures to r300_resource

Thu Feb 10 10:51:32 UTC 2011

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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Thu Feb 10 05:36:44 2011 +0100

r300g: consolidate buffers and textures to r300_resource

Transfers and create/destroy are still handled separately.

---

 src/gallium/drivers/r300/r300_blit.c          |    6 +-
 src/gallium/drivers/r300/r300_context.c       |    4 +-
 src/gallium/drivers/r300/r300_context.h       |   26 ++-
 src/gallium/drivers/r300/r300_emit.c          |   62 +++---
 src/gallium/drivers/r300/r300_fs.c            |    8 +-
 src/gallium/drivers/r300/r300_hyperz.c        |   14 +-
 src/gallium/drivers/r300/r300_render.c        |   10 +-
 src/gallium/drivers/r300/r300_resource.c      |   20 +-
 src/gallium/drivers/r300/r300_screen.c        |    2 +-
 src/gallium/drivers/r300/r300_screen_buffer.c |   42 +---
 src/gallium/drivers/r300/r300_screen_buffer.h |   23 --
 src/gallium/drivers/r300/r300_state.c         |   38 ++--
 src/gallium/drivers/r300/r300_state_derived.c |   24 +-
 src/gallium/drivers/r300/r300_texture.c       |  101 ++++-----
 src/gallium/drivers/r300/r300_texture.h       |    8 +-
 src/gallium/drivers/r300/r300_texture_desc.c  |  283 ++++++++++++-------------
 src/gallium/drivers/r300/r300_texture_desc.h  |    6 +-
 src/gallium/drivers/r300/r300_transfer.c      |   32 ++--
 18 files changed, 328 insertions(+), 381 deletions(-)

Diff:   http://cgit.freedesktop.org/mesa/mesa/diff/?id=56ba7e913fef0ea2b1bead582108f9ab3ab8263d