summaryrefslogtreecommitdiff
path: root/src/gallium/winsys/r600/drm/radeon_draw.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium/winsys/r600/drm/radeon_draw.c')
-rw-r--r--src/gallium/winsys/r600/drm/radeon_draw.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/gallium/winsys/r600/drm/radeon_draw.c b/src/gallium/winsys/r600/drm/radeon_draw.c
index 4413ed79fb..0eacdc74a0 100644
--- a/src/gallium/winsys/r600/drm/radeon_draw.c
+++ b/src/gallium/winsys/r600/drm/radeon_draw.c
@@ -74,12 +74,17 @@ struct radeon_draw *radeon_draw_decref(struct radeon_draw *draw)
int radeon_draw_set_new(struct radeon_draw *draw, struct radeon_state *state)
{
+ int id;
if (state == NULL)
return 0;
- if (state->type >= draw->radeon->ntype)
+
+ id = state->stype->base_id + (state->id + (state->stype->num * state->shader_index));
+ if (id > draw->radeon->nstate)
+ {
return -EINVAL;
- draw->state[state->id] = radeon_state_decref(draw->state[state->id]);
- draw->state[state->id] = state;
+ }
+ draw->state[id] = radeon_state_decref(draw->state[id]);
+ draw->state[id] = state;
return 0;
}