summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorIlia Mirkin <[email protected]>2017-04-02 10:48:11 -0400
committerIlia Mirkin <[email protected]>2017-04-02 10:58:32 -0400
commit1184fba86ef82831896f8550546b888f0cd0f60e (patch)
tree3e742ee4e0bfd553a49d3d265ff74b8796b7969e /src/gallium
parent7a0c1eee0c25e343d8c276e4471e4a113d61f233 (diff)
nvc0: fragprog may not be set when e.g. clearing
Signed-off-by: Ilia Mirkin <[email protected]>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c5
1 files 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;
}