Mesa (master): r300g: cleanup texture creation code

Marek Olšák mareko at kemper.freedesktop.org
Sun Jul 25 09:07:30 UTC 2010


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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sat Jul 24 21:32:53 2010 +0200

r300g: cleanup texture creation code

This decouples initializing a texture layout/miptree description
from an actual texture creation, it also partially unifies texture_create
and texture_from_handle.

r300_texture inherits r300_texture_desc, which inherits u_resource.

The CBZB clear criteria are moved to r300_texture_desc::cbzb_allowed[level].

And other minor cleanups.

---

 src/gallium/drivers/r300/Makefile             |    1 +
 src/gallium/drivers/r300/SConscript           |    1 +
 src/gallium/drivers/r300/r300_blit.c          |   19 +-
 src/gallium/drivers/r300/r300_context.h       |   64 ++--
 src/gallium/drivers/r300/r300_defines.h       |    5 +-
 src/gallium/drivers/r300/r300_fs.c            |    2 +-
 src/gallium/drivers/r300/r300_state.c         |   15 +-
 src/gallium/drivers/r300/r300_state_derived.c |    8 +-
 src/gallium/drivers/r300/r300_texture.c       |  593 ++++++-------------------
 src/gallium/drivers/r300/r300_texture.h       |    6 -
 src/gallium/drivers/r300/r300_texture_desc.c  |  456 +++++++++++++++++++
 src/gallium/drivers/r300/r300_texture_desc.h  |   57 +++
 src/gallium/drivers/r300/r300_transfer.c      |   49 +-
 13 files changed, 733 insertions(+), 543 deletions(-)

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



More information about the mesa-commit mailing list