From: Ilia Mirkin Date: Sun, 2 Apr 2017 14:48:11 +0000 (-0400) Subject: nvc0: fragprog may not be set when e.g. clearing X-Git-Tag: upstream/17.1.0~637 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1184fba86ef82831896f8550546b888f0cd0f60e;p=platform%2Fupstream%2Fmesa.git nvc0: fragprog may not be set when e.g. clearing Signed-off-by: Ilia Mirkin --- diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c index d4931cb..68fd730 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c @@ -605,8 +605,9 @@ nvc0_validate_min_samples(struct nvc0_context *nvc0) // have to do sample shading "to the max", otherwise there's no way to // tell which sets of samples are covered by the current invocation. // Similarly for reading the framebuffer. - if (nvc0->fragprog->fp.sample_mask_in || - nvc0->fragprog->fp.reads_framebuffer) + if (nvc0->fragprog && ( + nvc0->fragprog->fp.sample_mask_in || + nvc0->fragprog->fp.reads_framebuffer)) samples = util_framebuffer_get_num_samples(&nvc0->framebuffer); samples |= NVC0_3D_SAMPLE_SHADING_ENABLE; }