Mesa (master): Revert "r600g: simplify states"

Dave Airlie airlied at kemper.freedesktop.org
Fri Aug 27 05:47:16 UTC 2010


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

Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Aug 27 15:45:58 2010 +1000

Revert "r600g: simplify states"

This reverts commit bd25e23bf3740f59ce8859848c715daeb9e9821f.

Apart from introducing a lot of hex magic numbers and being highly impenetable code,
it causes lots of lockups on an average piglit run that always runs without lockups.

Always run piglit before/after doing big things like this.

---

 src/gallium/drivers/r600/r600_blit.c       |   61 +-
 src/gallium/drivers/r600/r600_context.c    |    9 +-
 src/gallium/drivers/r600/r600_draw.c       |   46 +-
 src/gallium/drivers/r600/r600_query.c      |    6 +-
 src/gallium/drivers/r600/r600_shader.c     |    7 +-
 src/gallium/drivers/r600/r600_state.c      |   78 +-
 src/gallium/drivers/r600/r600_texture.c    |   18 +-
 src/gallium/drivers/r600/radeon.h          |  669 ++-
 src/gallium/winsys/r600/drm/r600_state.c   | 8091 ++--------------------------
 src/gallium/winsys/r600/drm/r600_states.h  |  562 ++
 src/gallium/winsys/r600/drm/radeon.c       |   44 +
 src/gallium/winsys/r600/drm/radeon_ctx.c   |  313 +-
 src/gallium/winsys/r600/drm/radeon_draw.c  |    3 +-
 src/gallium/winsys/r600/drm/radeon_priv.h  |   34 +-
 src/gallium/winsys/r600/drm/radeon_state.c |   56 +-
 15 files changed, 1720 insertions(+), 8277 deletions(-)

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



More information about the mesa-commit mailing list