diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2016-01-15 15:46:31 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2016-01-18 17:39:37 +0900 |
| commit | 0491dd1deb46ca77545322c53e90f86ae244cdae (patch) | |
| tree | 13f29c51cc2364c522849be024b9c3df49b56995 /src/gallium/state_trackers/dri | |
| parent | a9ab7172a621294f5d7b5dfac3363bed240e20a0 (diff) | |
| download | external_mesa3d-0491dd1deb46ca77545322c53e90f86ae244cdae.zip external_mesa3d-0491dd1deb46ca77545322c53e90f86ae244cdae.tar.gz external_mesa3d-0491dd1deb46ca77545322c53e90f86ae244cdae.tar.bz2 | |
st/dri: Don't call invalidate_resource for NULL depth/stencil buffers
Fixes crash in 4 EGL piglit tests with radeonsi.
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Diffstat (limited to 'src/gallium/state_trackers/dri')
| -rw-r--r-- | src/gallium/state_trackers/dri/dri_drawable.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/dri/dri_drawable.c b/src/gallium/state_trackers/dri/dri_drawable.c index f0cc4a2..adc5128 100644 --- a/src/gallium/state_trackers/dri/dri_drawable.c +++ b/src/gallium/state_trackers/dri/dri_drawable.c @@ -492,8 +492,10 @@ dri_flush(__DRIcontext *cPriv, if (pipe->invalidate_resource && (flags & __DRI2_FLUSH_INVALIDATE_ANCILLARY)) { - pipe->invalidate_resource(pipe, drawable->textures[ST_ATTACHMENT_DEPTH_STENCIL]); - pipe->invalidate_resource(pipe, drawable->msaa_textures[ST_ATTACHMENT_DEPTH_STENCIL]); + if (drawable->textures[ST_ATTACHMENT_DEPTH_STENCIL]) + pipe->invalidate_resource(pipe, drawable->textures[ST_ATTACHMENT_DEPTH_STENCIL]); + if (drawable->msaa_textures[ST_ATTACHMENT_DEPTH_STENCIL]) + pipe->invalidate_resource(pipe, drawable->msaa_textures[ST_ATTACHMENT_DEPTH_STENCIL]); } } |