diff options
| author | Iván Briano <ivan.briano@intel.com> | 2022-02-10 14:26:21 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2022-02-24 14:56:50 -0800 |
| commit | 3241c61b682adaf5a061c7ab4fc0eb737b91fa99 (patch) | |
| tree | ee981e5d9258832fbbe3b341bedefa9c3a108cbf | |
| parent | e791cc3ca530669bb2ed0f450417549403b972ed (diff) | |
anv: make the pointer valid before we assign stuff into it
Fixes: 665ffd4bf9c ("anv: Update VK_KHR_fragment_shading_rate for newer HW")
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14982>
(cherry picked from commit e2a5e2d5a0f8ed972a4669be9c5d689a6b3e7bca)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_pass.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index 7cbcdc78888..eef415ac1d3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1507,7 +1507,7 @@ "description": "anv: make the pointer valid before we assign stuff into it", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "665ffd4bf9c681f8fc37dc07b3c2445e1ed5bf25" }, diff --git a/src/intel/vulkan/anv_pass.c b/src/intel/vulkan/anv_pass.c index a4765479c60..a4a59b52cec 100644 --- a/src/intel/vulkan/anv_pass.c +++ b/src/intel/vulkan/anv_pass.c @@ -675,6 +675,7 @@ anv_dynamic_pass_init_full(struct anv_dynamic_render_pass *dyn_render_pass, .usage = VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR, }; + subpass->fsr_attachment = &subpass_attachments[fsr_idx]; *subpass->fsr_attachment = (struct anv_subpass_attachment) { .usage = VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR, .attachment = fsr_idx, |