You missed this change (or something functionally similar):
diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c
index e7bb81489f6..5d35af05579 100644
--- a/src/amd/vulkan/radv_query.c
+++ b/src/amd/vulkan/radv_query.c
@@ -630,8 +630,8 @@ build_tfb_query_shader(struct radv_device
When we switched over to 1-bit booleans, the radv query shaders ended up
still using 32-bit booleans for most stuff. While this is technically
valid from an IR perspective, most of the NIR passes don't really support
32-bit booleans correctly anymore now that we've moved to 1-bit. This tiny
serie
