diff options
| author | Jerome Glisse <jglisse@redhat.com> | 2010-08-24 17:46:31 -0400 |
|---|---|---|
| committer | Jerome Glisse <jglisse@redhat.com> | 2010-08-25 17:41:50 -0400 |
| commit | bd25e23bf3740f59ce8859848c715daeb9e9821f (patch) | |
| tree | a5a3aee080ec3dbf75a85aa1a5eafae538465c5b /src/gallium/winsys/r600/drm/radeon_draw.c | |
| parent | b5c07b9226d8e7de78f6367b5799b39caf820ef3 (diff) | |
r600g: simplify states
Directly build PM4 packet, avoid using malloc (no states are
bigger than 128 dwords), remove unecessary informations,
remove pm4 building in favor of prebuild pm4 packet.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
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, 1 insertions, 2 deletions
diff --git a/src/gallium/winsys/r600/drm/radeon_draw.c b/src/gallium/winsys/r600/drm/radeon_draw.c index 4413ed79fb..1b4e557f28 100644 --- a/src/gallium/winsys/r600/drm/radeon_draw.c +++ b/src/gallium/winsys/r600/drm/radeon_draw.c @@ -76,8 +76,6 @@ 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; @@ -102,6 +100,7 @@ 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; |