From d5f3233a06198c3f63447c9d833daf17b2ced4c1 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Thu, 25 Apr 2024 04:23:54 -0500 Subject: [PATCH] spirv: Use spirv_capabilities in tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Alyssa Rosenzweig Reviewed-by: Iván Briano Acked-By: Mike Blumenkrantz Part-of: --- src/compiler/spirv/tests/helpers.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/compiler/spirv/tests/helpers.h b/src/compiler/spirv/tests/helpers.h index 6d8b4200e10..b69a607db04 100644 --- a/src/compiler/spirv/tests/helpers.h +++ b/src/compiler/spirv/tests/helpers.h @@ -25,6 +25,7 @@ #include #include "compiler/spirv/nir_spirv.h" +#include "compiler/spirv/spirv_info.h" #include "compiler/nir/nir.h" class spirv_test : public ::testing::Test { @@ -43,11 +44,15 @@ protected: void get_nir(size_t num_words, const uint32_t *words, gl_shader_stage stage = MESA_SHADER_COMPUTE) { + spirv_capabilities spirv_caps = {}; + spirv_caps.Shader = true; + spirv_caps.VulkanMemoryModel = true; + spirv_caps.VulkanMemoryModelDeviceScope = true; + spirv_to_nir_options spirv_options; memset(&spirv_options, 0, sizeof(spirv_options)); spirv_options.environment = NIR_SPIRV_VULKAN; - spirv_options.caps.vk_memory_model = true; - spirv_options.caps.vk_memory_model_device_scope = true; + spirv_options.capabilities = &spirv_caps; spirv_options.ubo_addr_format = nir_address_format_32bit_index_offset; spirv_options.ssbo_addr_format = nir_address_format_32bit_index_offset; spirv_options.phys_ssbo_addr_format = nir_address_format_64bit_global;