From b175effc7252f9e73dd78dfac0380cae69966234 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Mon, 20 Jan 2020 17:35:55 +0100 Subject: [PATCH] zink: set compareEnable when setting compareOp We need to enable compareEnable for compareOp to be valid, and ANV was recently updated to respect this. So let's update Zink to match. This fixes the shadow-variants of several piglit regressions, like these: spec@arb_shader_texture_lod@execution@tex-miplevel-selection spec@glsl-1.20@execution@tex-miplevel-selection Fixes: a19cdf989b1 ("anv: only use VkSamplerCreateInfo::compareOp if enabled") Reviewed-by: Eric Engestrom Tested-by: Marge Bot Part-of: --- src/gallium/drivers/zink/zink_context.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index f79e289727d..f2b9044bc2b 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -140,8 +140,10 @@ zink_create_sampler_state(struct pipe_context *pctx, if (state->compare_mode == PIPE_TEX_COMPARE_NONE) sci.compareOp = VK_COMPARE_OP_NEVER; - else + else { sci.compareOp = compare_op(state->compare_func); + sci.compareEnable = VK_TRUE; + } sci.borderColor = VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK; // TODO sci.unnormalizedCoordinates = !state->normalized_coords;