Mesa (master): Revert "r600g: don't use dynamic state allocation for states "

[Jerome Glisse]

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

Author: Jerome Glisse <jglisse at redhat.com>
Date:   Fri Aug  6 10:59:27 2010 -0400

Revert "r600g: don't use dynamic state allocation for states"

This reverts commit 9c949d4a4dd43b7889e13bdf683bcf211f049ced.

Conflicts:

	src/gallium/drivers/r600/r600_context.h
	src/gallium/drivers/r600/r600_draw.c
	src/gallium/drivers/r600/r600_shader.c
	src/gallium/drivers/r600/r600_state.c

---

 src/gallium/drivers/r600/r600_context.c    |  141 +++++++-------
 src/gallium/drivers/r600/r600_context.h    |   29 ++--
 src/gallium/drivers/r600/r600_draw.c       |  104 +++++-----
 src/gallium/drivers/r600/r600_shader.c     |   34 ++--
 src/gallium/drivers/r600/r600_state.c      |  283 +++++++++++++++++-----------
 src/gallium/drivers/r600/radeon.h          |   52 ++----
 src/gallium/targets/dri-r600/Makefile      |    4 +-
 src/gallium/winsys/r600/drm/radeon.c       |   11 +
 src/gallium/winsys/r600/drm/radeon_ctx.c   |  160 +++++++++++-----
 src/gallium/winsys/r600/drm/radeon_draw.c  |   92 +++++++++-
 src/gallium/winsys/r600/drm/radeon_priv.h  |   29 +++
 src/gallium/winsys/r600/drm/radeon_state.c |   70 +++++++-
 12 files changed, 647 insertions(+), 362 deletions(-)

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