diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-08-27 15:45:58 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-27 15:45:58 +1000 |
| commit | 2184f3ec3059eaf8a9a2b04c995162543f000862 (patch) | |
| tree | e0d2e070b1688b56384d0deca0fb6ddf15a2787b /src/gallium/winsys/r600/drm/radeon_draw.c | |
| parent | a03d456f5a41926e39194de70b2d50776e64b8a2 (diff) | |
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.
Diffstat (limited to 'src/gallium/winsys/r600/drm/radeon_draw.c')
| -rw-r--r-- | src/gallium/winsys/r600/drm/radeon_draw.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/winsys/r600/drm/radeon_draw.c b/src/gallium/winsys/r600/drm/radeon_draw.c index 1b4e557f28..4413ed79fb 100644 --- a/src/gallium/winsys/r600/drm/radeon_draw.c +++ b/src/gallium/winsys/r600/drm/radeon_draw.c @@ -76,6 +76,8 @@ int radeon_draw_set_new(struct radeon_draw *draw, struct radeon_state *state) { if (state == NULL) return 0; + if (state->type >= draw->radeon->ntype) + return -EINVAL; draw->state[state->id] = radeon_state_decref(draw->state[state->id]); draw->state[state->id] = state; return 0; @@ -100,7 +102,6 @@ int radeon_draw_check(struct radeon_draw *draw) for (i = 0, draw->cpm4 = 0; i < draw->nstate; i++) { if (draw->state[i]) { draw->cpm4 += draw->state[i]->cpm4; - draw->cpm4 += draw->radeon->type[draw->state[i]->id].header_cpm4; } } return 0; |