diff --git a/.pick_status.json b/.pick_status.json index a5e322b0ac9..342dfc0756e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -166,7 +166,7 @@ "description": "zink: stop enabling minmax filtering when not supported", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/zink_device_info.py b/src/gallium/drivers/zink/zink_device_info.py index d26908e35ee..d36c915c6ec 100644 --- a/src/gallium/drivers/zink/zink_device_info.py +++ b/src/gallium/drivers/zink/zink_device_info.py @@ -160,7 +160,8 @@ EXTENSIONS = [ conditions=["$feats.shaderSubgroupClock"]), Extension("VK_EXT_sampler_filter_minmax", alias="reduction", - properties=True), + properties=True, + conditions=["$props.filterMinmaxSingleComponentFormats"]), Extension("VK_EXT_custom_border_color", alias="border_color", properties=True, diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 54d44714849..cec8a7add2a 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -683,7 +683,7 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param) return screen->info.props.limits.maxTexelGatherOffset; case PIPE_CAP_SAMPLER_REDUCTION_MINMAX_ARB: - return screen->vk_version >= VK_MAKE_VERSION(1,2,0) || screen->info.have_EXT_sampler_filter_minmax; + return screen->info.feats12.samplerFilterMinmax || screen->info.have_EXT_sampler_filter_minmax; case PIPE_CAP_FS_FINE_DERIVATIVE: return 1;