fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-09 08:20:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

panfrost: Handle resources without depth in batch_to_fb_info

Browse source 
Prevent preloading data from resources which doesn't exist.

Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Tested-by: Aleksey Komarov <q4arus@ya.ru>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20238>
This commit is contained in:
David Heidelberg 2022-12-09 12:06:39 +01:00 • committed by Marge Bot
parent d76d791565
commit 8560c7613d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/drivers/panfrost/pan_job.c
View file

@ -604,22 +604,22 @@ panfrost_batch_to_fb_info(const struct panfrost_batch *batch,
fb->zs.discard.z = !reserve && !(batch->resolve & PIPE_CLEAR_DEPTH);
fb->zs.discard.s = !reserve && !(batch->resolve & PIPE_CLEAR_STENCIL);
if (!fb->zs.clear.z &&
if (!fb->zs.clear.z && z_rsrc &&
((batch->read & PIPE_CLEAR_DEPTH) ||
((batch->draws & PIPE_CLEAR_DEPTH) &&
z_rsrc && BITSET_TEST(z_rsrc->valid.data, z_view->first_level))))
BITSET_TEST(z_rsrc->valid.data, z_view->first_level))))
fb->zs.preload.z = true;
if (!fb->zs.clear.s &&
if (!fb->zs.clear.s && s_rsrc &&
((batch->read & PIPE_CLEAR_STENCIL) ||
((batch->draws & PIPE_CLEAR_STENCIL) &&
s_rsrc && BITSET_TEST(s_rsrc->valid.data, s_view->first_level))))
BITSET_TEST(s_rsrc->valid.data, s_view->first_level))))
fb->zs.preload.s = true;
/* Preserve both component if we have a combined ZS view and
* one component needs to be preserved.
*/
if (s_view == z_view && fb->zs.discard.z != fb->zs.discard.s) {
if (z_view && z_view == s_view && fb->zs.discard.z != fb->zs.discard.s) {
bool valid = BITSET_TEST(z_rsrc->valid.data, z_view->first_level);
fb->zs.discard.z = false;