aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/radeonsi/si_state.c
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2018-05-30 23:21:28 -0400
committerMarek Olšák <[email protected]>2018-06-13 22:00:36 -0400
commit22e994bb7511c375fcad0163952258be28856840 (patch)
tree4c069aa16ab36cca5fa6dd079ddcba897ab8e1b3 /src/gallium/drivers/radeonsi/si_state.c
parentf3b3ee6974d1b34b219f0d960a1424afe07a93f1 (diff)
radeonsi: assume that rasterizer state is non-NULL in draw_vbo
Tested-by: Dieter Nützel <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_state.c')
-rw-r--r--src/gallium/drivers/radeonsi/si_state.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 69a53f7a10b..fb4649771fc 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -1418,7 +1418,7 @@ static void si_emit_db_render_state(struct si_context *sctx)
}
/* Disable the gl_SampleMask fragment shader output if MSAA is disabled. */
- if (!rs || !rs->multisample_enable)
+ if (!rs->multisample_enable)
db_shader_control &= C_02880C_MASK_EXPORT_ENABLE;
if (sctx->screen->has_rbplus &&
@@ -3251,7 +3251,7 @@ static void si_emit_msaa_sample_locs(struct si_context *sctx)
*/
if (has_msaa_sample_loc_bug &&
sctx->framebuffer.nr_samples > 1 &&
- rs && !rs->multisample_enable)
+ !rs->multisample_enable)
small_prim_filter_cntl &= C_028830_SMALL_PRIM_FILTER_ENABLE;
radeon_opt_set_context_reg(sctx,