diff options
| author | Marek Olšák <[email protected]> | 2019-02-07 00:01:13 -0500 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2019-02-26 14:58:55 -0500 |
| commit | a1378639ab19682a818ee627745db7f67485d406 (patch) | |
| tree | 8c0229bbb0633b4ac6cdf95258c80f2a6d11b521 /src/gallium/drivers/radeonsi/si_compute.c | |
| parent | c0110477b5503978adf37f64c65c30c9304e3fe4 (diff) | |
radeonsi: always use compute rings for clover on CI and newer (v2)
initialize all non-compute context functions to NULL.
v2: fix SI
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_compute.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_compute.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c index 1a62b3e0844..87addd53976 100644 --- a/src/gallium/drivers/radeonsi/si_compute.c +++ b/src/gallium/drivers/radeonsi/si_compute.c @@ -887,12 +887,14 @@ static void si_launch_grid( program->shader.compilation_failed) return; - if (sctx->last_num_draw_calls != sctx->num_draw_calls) { - si_update_fb_dirtiness_after_rendering(sctx); - sctx->last_num_draw_calls = sctx->num_draw_calls; - } + if (sctx->has_graphics) { + if (sctx->last_num_draw_calls != sctx->num_draw_calls) { + si_update_fb_dirtiness_after_rendering(sctx); + sctx->last_num_draw_calls = sctx->num_draw_calls; + } - si_decompress_textures(sctx, 1 << PIPE_SHADER_COMPUTE); + si_decompress_textures(sctx, 1 << PIPE_SHADER_COMPUTE); + } /* Add buffer sizes for memory checking in need_cs_space. */ si_context_add_resource_size(sctx, &program->shader.bo->b.b); @@ -924,7 +926,8 @@ static void si_launch_grid( si_upload_compute_shader_descriptors(sctx); si_emit_compute_shader_pointers(sctx); - if (si_is_atom_dirty(sctx, &sctx->atoms.s.render_cond)) { + if (sctx->has_graphics && + si_is_atom_dirty(sctx, &sctx->atoms.s.render_cond)) { sctx->atoms.s.render_cond.emit(sctx); si_set_atom_dirty(sctx, &sctx->atoms.s.render_cond, false); } |