From 7e4e5fbdfbda646e8e42650356e434c45f6d85b7 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 18 Jan 2024 10:30:03 -0500 Subject: [PATCH] zink: set more dynamic states when using shader objects fixes #10457 cc: mesa-stable Part-of: (cherry picked from commit df45cbddb59a19293dc63f2d7df0d2fbc24a457e) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_draw.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index ab32c50807f..27cd7c7f9c9 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2104,7 +2104,7 @@ "description": "zink: set more dynamic states when using shader objects", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/zink/zink_draw.cpp b/src/gallium/drivers/zink/zink_draw.cpp index 55af43720fa..1526f3fc077 100644 --- a/src/gallium/drivers/zink/zink_draw.cpp +++ b/src/gallium/drivers/zink/zink_draw.cpp @@ -435,6 +435,8 @@ update_gfx_pipeline(struct zink_context *ctx, struct zink_batch_state *bs, enum /* always rebind all stages */ VKCTX(CmdBindShadersEXT)(bs->cmdbuf, ZINK_GFX_SHADER_COUNT, stages, ctx->curr_program->objects); VKCTX(CmdSetDepthBiasEnable)(bs->cmdbuf, VK_TRUE); + VKCTX(CmdSetTessellationDomainOriginEXT)(bs->cmdbuf, VK_TESSELLATION_DOMAIN_ORIGIN_LOWER_LEFT); + VKCTX(CmdSetSampleLocationsEnableEXT)(bs->cmdbuf, ctx->gfx_pipeline_state.sample_locations_enabled); } ctx->shobj_draw = true; }