Mesa (staging/22.1): anv: add missing logic op set in pipeline dyn state
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed May 4 23:16:57 UTC 2022
Module: Mesa
Branch: staging/22.1
Commit: ebb13496c401706e9d5c013866495e362952e627
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ebb13496c401706e9d5c013866495e362952e627
Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date: Fri Apr 29 23:08:42 2022 +0300
anv: add missing logic op set in pipeline dyn state
v2: add ANV_CMD_DIRTY_DYNAMIC_LOGIC_OP check (Tapani)
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Fixes: 75ad0e4b0874 ("anv: support blending logic op dynamic state")
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16220>
(cherry picked from commit 69e6417e19793043e4bb3cd500cfcf377bce4c03)
---
.pick_status.json | 2 +-
src/intel/vulkan/anv_pipeline.c | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/.pick_status.json b/.pick_status.json
index 597018e6a17..c466b1c00f6 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1003,7 +1003,7 @@
"description": "anv: add missing logic op set in pipeline dyn state",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": "75ad0e4b087410dceaaa00184b64ea15ec61540a"
},
diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c
index 7a365b0f155..62313abf978 100644
--- a/src/intel/vulkan/anv_pipeline.c
+++ b/src/intel/vulkan/anv_pipeline.c
@@ -2350,6 +2350,11 @@ copy_non_dynamic_state(struct anv_graphics_pipeline *pipeline,
}
}
+ if (states & ANV_CMD_DIRTY_DYNAMIC_LOGIC_OP) {
+ if (!raster_discard && anv_rendering_uses_color_attachment(rendering_info))
+ dynamic->logic_op = pCreateInfo->pColorBlendState->logicOp;
+ }
+
const VkPipelineFragmentShadingRateStateCreateInfoKHR *fsr_state =
vk_find_struct_const(pCreateInfo->pNext,
PIPELINE_FRAGMENT_SHADING_RATE_STATE_CREATE_INFO_KHR);
More information about the mesa-commit
mailing list