fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 22:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: avoid uninit values in renderpass state

Browse source 
cc: mesa-stable

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17010>
(cherry picked from commit d8877437d6)
This commit is contained in:
Mike Blumenkrantz 2022-06-13 15:05:09 -04:00 • committed by Dylan Baker
parent d9a67ee393
commit 914ff0ab42
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1165,7 +1165,7 @@
"description": "zink: avoid uninit values in renderpass state",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

10
src/gallium/drivers/zink/zink_render_pass.c
View file

@ -162,6 +162,7 @@ create_render_pass2(struct zink_screen *screen, struct zink_render_pass_state *s
pstate->num_attachments = state->num_cbufs;
pstate->num_cresolves = state->num_cresolves;
pstate->num_zsresolves = state->num_zsresolves;
pstate->fbfetch = 0;
for (int i = 0; i < state->num_cbufs; i++) {
struct zink_rt_attrib *rt = state->rts + i;
attachments[i].sType = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_2;
@ -267,12 +268,9 @@ create_render_pass2(struct zink_screen *screen, struct zink_render_pass_state *s
}
pstate->num_attachments++;
}
if (dep_access & VK_ACCESS_COLOR_ATTACHMENT_READ_BIT)
pstate->color_read = true;
if (dep_access & VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT)
pstate->depth_read = true;
if (dep_access & VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT)
pstate->depth_write = true;
pstate->color_read = (dep_access & VK_ACCESS_COLOR_ATTACHMENT_READ_BIT) > 0;
pstate->depth_read = (dep_access & VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT) > 0;
pstate->depth_write = (dep_access & VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT) > 0;
if (!screen->info.have_KHR_synchronization2)
dep_pipeline = MAX2(dep_pipeline, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT);