From f4a66eadf9685858da40c079dea7c06602ae9999 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Tue, 14 May 2024 09:32:53 -0400
Subject: [PATCH] zink: set all spirv caps for the vvl vtn pass

this avoids internal warnings/errors from caps

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29195>
---
 src/gallium/drivers/zink/zink_compiler.c | 51 +-----------------------
 1 file changed, 1 insertion(+), 50 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c
index 0b7402932a3..512cf05e82e 100644
--- a/src/gallium/drivers/zink/zink_compiler.c
+++ b/src/gallium/drivers/zink/zink_compiler.c
@@ -3398,58 +3398,9 @@ zink_shader_spirv_compile(struct zink_screen *screen, struct zink_shader *zs, st
 
 #ifndef NDEBUG
    if (zink_debug & ZINK_DEBUG_VALIDATION) {
-      static const struct spirv_capabilities spirv_caps = {
-         .Float64 = true,
-         .Int16 = true,
-         .Int64 = true,
-         .Tessellation = true,
-         .DenormFlushToZero = true,
-         .DenormPreserve = true,
-         .SignedZeroInfNanPreserve = true,
-         .RoundingModeRTE = true,
-         .RoundingModeRTZ = true,
-         .ImageMSArray = true,
-         .StorageImageReadWithoutFormat = true,
-         .StorageImageWriteWithoutFormat = true,
-         .StorageImageMultisample = true,
-         .GeometryStreams = true,
-         .StorageBuffer8BitAccess = true,
-         .UniformAndStorageBuffer8BitAccess = true,
-         .StoragePushConstant8 = true,
-         .StorageBuffer16BitAccess = true,
-         .UniformAndStorageBuffer16BitAccess = true,
-         .StoragePushConstant16 = true,
-         .StorageInputOutput16 = true,
-         .VariablePointers = true,
-         .StencilExportEXT = true,
-         .SampleMaskPostDepthCoverage = true,
-         .TransformFeedback = true,
-         .DeviceGroup = true,
-         .DrawParameters = true,
-         .ShaderViewportIndexLayerEXT = true,
-         .MultiView = true,
-         .PhysicalStorageBufferAddresses = true,
-         .Int64Atomics = true,
-         .GroupNonUniform = true,
-         .GroupNonUniformArithmetic = true,
-         .GroupNonUniformBallot = true,
-         .GroupNonUniformQuad = true,
-         .GroupNonUniformShuffle = true,
-         .GroupNonUniformVote = true,
-         .VulkanMemoryModel = true,
-         .VulkanMemoryModelDeviceScope = true,
-         .Int8 = true,
-         .Float16 = true,
-         .DemoteToHelperInvocation = true,
-         .SparseResidency = true,
-         .MinLod = true,
-         .WorkgroupMemoryExplicitLayoutKHR = true,
-         .WorkgroupMemoryExplicitLayout8BitAccessKHR = true,
-         .WorkgroupMemoryExplicitLayout16BitAccessKHR = true,
-      };
       static const struct spirv_to_nir_options spirv_options = {
          .environment = NIR_SPIRV_VULKAN,
-         .capabilities = &spirv_caps,
+         .capabilities = NULL,
          .ubo_addr_format = nir_address_format_32bit_index_offset,
          .ssbo_addr_format = nir_address_format_32bit_index_offset,
          .phys_ssbo_addr_format = nir_address_format_64bit_global,