From 1184fba86ef82831896f8550546b888f0cd0f60e Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Sun, 2 Apr 2017 10:48:11 -0400 Subject: [PATCH] nvc0: fragprog may not be set when e.g. clearing Signed-off-by: Ilia Mirkin --- src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c index d4931cbc675..68fd73064c8 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; } -- 2.30.2