diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2015-09-10 18:33:10 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2015-09-24 19:51:43 +0200 |
| commit | 1f99b0be7e4e300c2b1761437f740a604ab036bc (patch) | |
| tree | 9f5861dc64ccd87431f43828b993d1196d84f9a8 /src/gallium | |
| parent | 237d7cccce15b91590afa90020ff71324217fdb9 (diff) | |
| download | external_mesa3d-1f99b0be7e4e300c2b1761437f740a604ab036bc.zip external_mesa3d-1f99b0be7e4e300c2b1761437f740a604ab036bc.tar.gz external_mesa3d-1f99b0be7e4e300c2b1761437f740a604ab036bc.tar.bz2 | |
radeonsi: skip drawing if PS fails to compile or upload
Cc: 11.0 <mesa-stable@lists.freedesktop.org>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state_shaders.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index aabd499..b006f52 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -1487,18 +1487,9 @@ bool si_update_shaders(struct si_context *sctx) si_update_vgt_shader_config(sctx); - si_shader_select(ctx, sctx->ps_shader); - - if (!sctx->ps_shader->current) { - struct si_shader_selector *sel; - - /* use a dummy shader if compiling the shader (variant) failed */ - si_make_dummy_ps(sctx); - sel = sctx->dummy_pixel_shader; - si_shader_select(ctx, sel); - sctx->ps_shader->current = sel->current; - } - + r = si_shader_select(ctx, sctx->ps_shader); + if (r) + return false; si_pm4_bind_state(sctx, ps, sctx->ps_shader->current->pm4); if (si_pm4_state_changed(sctx, ps) || si_pm4_state_changed(sctx, vs) || |