Module: Mesa Branch: main Commit: 4325efd2cf6f0c995d63d4a65da0f324a987de13 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4325efd2cf6f0c995d63d4a65da0f324a987de13
Author: George Ouzounoudis <geothr...@gmail.com> Date: Mon Aug 21 19:59:42 2023 +0300 nvk: Move SET_BLEND_STATE_PER_TARGET to graphics state initialization We never change this state so it needs to be set only once at state init. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24872> --- src/nouveau/vulkan/nvk_cmd_draw.c | 1 + src/nouveau/vulkan/nvk_graphics_pipeline.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/nouveau/vulkan/nvk_cmd_draw.c b/src/nouveau/vulkan/nvk_cmd_draw.c index 8284de36635..7058c7e2bb0 100644 --- a/src/nouveau/vulkan/nvk_cmd_draw.c +++ b/src/nouveau/vulkan/nvk_cmd_draw.c @@ -250,6 +250,7 @@ nvk_queue_init_context_draw_state(struct nvk_queue *queue) P_IMMD(p, NV9097, SET_BLEND_OPT_CONTROL, ALLOW_FLOAT_PIXEL_KILLS_TRUE); P_IMMD(p, NV9097, SET_BLEND_FLOAT_OPTION, ZERO_TIMES_ANYTHING_IS_ZERO_TRUE); + P_IMMD(p, NV9097, SET_BLEND_STATE_PER_TARGET, ENABLE_TRUE); if (dev->pdev->info.cls_eng3d < MAXWELL_A) P_IMMD(p, NV9097, SET_MAX_TI_WARPS_PER_BATCH, 3); diff --git a/src/nouveau/vulkan/nvk_graphics_pipeline.c b/src/nouveau/vulkan/nvk_graphics_pipeline.c index c5077086500..31c0dd7aa4b 100644 --- a/src/nouveau/vulkan/nvk_graphics_pipeline.c +++ b/src/nouveau/vulkan/nvk_graphics_pipeline.c @@ -145,8 +145,6 @@ static void emit_pipeline_cb_state(struct nv_push *p, const struct vk_color_blend_state *cb) { - P_IMMD(p, NV9097, SET_BLEND_STATE_PER_TARGET, ENABLE_TRUE); - for (uint32_t a = 0; a < cb->attachment_count; a++) { const struct vk_color_blend_attachment_state *att = &cb->attachments[a]; P_IMMD(p, NV9097, SET_BLEND(a), att->blend_enable);
