From 245ef2b49dd0c3bd55ab08dc956ae4c0b7cd3317 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 14 Jun 2022 10:22:08 -0400 Subject: [PATCH] zink: don't print VK_EXT_shader_atomic_float warning for nir_intrinsic_image_deref_atomic_exchange this is covered by base spec and doesn't require the extension cc: mesa-stable Reviewed-by: Adam Jackson Part-of: (cherry picked from commit 03d7f31054b16b17eaafe1714c4648151861c014) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_compiler.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 3d288faef72..f423423441e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1156,7 +1156,7 @@ "description": "zink: don't print VK_EXT_shader_atomic_float warning for nir_intrinsic_image_deref_atomic_exchange", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c index e004825ef18..af5a7d14151 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -1965,8 +1965,7 @@ scan_nir(struct zink_screen *screen, nir_shader *shader, struct zink_shader *zs) static bool warned = false; if (!screen->info.have_EXT_shader_atomic_float && !screen->is_cpu && !warned) { switch (intr->intrinsic) { - case nir_intrinsic_image_deref_atomic_add: - case nir_intrinsic_image_deref_atomic_exchange: { + case nir_intrinsic_image_deref_atomic_add: { nir_variable *var = nir_intrinsic_get_var(intr, 0); if (util_format_is_float(var->data.image.format)) fprintf(stderr, "zink: Vulkan driver missing VK_EXT_shader_atomic_float but attempting to do atomic ops!\n");