diff options
| author | Marek Olšák <[email protected]> | 2015-02-22 19:14:42 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2015-02-24 21:21:04 +0100 |
| commit | 0b1f31ab7fb323df14801dc3869c9de437c174d5 (patch) | |
| tree | 4c01ea2f441b1468afd56be5e4e7fab15f619541 | |
| parent | 4eb0ccf9e7902a0b1c9b691fa37852f31cb2befc (diff) | |
radeonsi: set current_rast_prim in the right place
Reviewed-by: Michel Dänzer <[email protected]>
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state_draw.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c index 511bea283ac..cb147c36708 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.c +++ b/src/gallium/drivers/radeonsi/si_state_draw.c @@ -502,12 +502,18 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info) if (!sctx->ps_shader || !sctx->vs_shader) return; + si_decompress_textures(sctx); + + /* Set the rasterization primitive type. + * + * This must be done after si_decompress_textures, which can call + * draw_vbo recursively, and before si_update_shaders, which uses + * current_rast_prim for this draw_vbo call. */ if (sctx->gs_shader) sctx->current_rast_prim = sctx->gs_shader->gs_output_prim; else sctx->current_rast_prim = info->mode; - si_decompress_textures(sctx); si_update_shaders(sctx); if (sctx->vertex_buffers_dirty) { |