diff options
| author | Gurchetan Singh <gurchetansingh@google.com> | 2024-01-19 07:54:58 -0800 |
|---|---|---|
| committer | Gurchetan Singh <gurchetansingh@google.com> | 2024-03-05 18:20:46 -0800 |
| commit | 27704e08b8189805162d83482394e717e5b4bc2e (patch) | |
| tree | 7347fd0e75e9e0e74457ca9d8dd09a7f5a8a8cda | |
| parent | 52eeace9f394dd0f234d618b1da2f5c049e96748 (diff) | |
| download | mesa3d-27704e08b8189805162d83482394e717e5b4bc2e.tar.gz | |
ANDROID: vulkan: vk_compiler_* functions --> #ifdefs
A stylistic change by popular demand.
Bug: 327408955
Test: compile
Change-Id: Ic737a5257e431ab1800a43868e9551e7f413fa77
| -rw-r--r-- | src/vulkan/runtime/vk_instance.c | 13 | ||||
| -rw-r--r-- | src/vulkan/util/vk_util.c | 17 | ||||
| -rw-r--r-- | src/vulkan/util/vk_util.h | 6 |
3 files changed, 11 insertions, 25 deletions
diff --git a/src/vulkan/runtime/vk_instance.c b/src/vulkan/runtime/vk_instance.c index f375c16f365..cbb9fadc313 100644 --- a/src/vulkan/runtime/vk_instance.c +++ b/src/vulkan/runtime/vk_instance.c @@ -34,6 +34,10 @@ #include "vk_debug_utils.h" #include "vk_physical_device.h" +#if USE_VK_COMPILER +#include "compiler/glsl_types.h" +#endif + #define VERSION_IS_1_0(version) \ (VK_API_VERSION_MAJOR(version) == 1 && VK_API_VERSION_MINOR(version) == 0) @@ -199,7 +203,9 @@ vk_instance_init(struct vk_instance *instance, instance->trace_frame = (uint32_t)debug_get_num_option("MESA_VK_TRACE_FRAME", 0xFFFFFFFF); instance->trace_trigger_file = secure_getenv("MESA_VK_TRACE_TRIGGER"); - vk_compiler_cache_init(); +#if USE_VK_COMPILER + glsl_type_singleton_init_or_ref(); +#endif return VK_SUCCESS; } @@ -219,7 +225,10 @@ vk_instance_finish(struct vk_instance *instance) { destroy_physical_devices(instance); - vk_compiler_cache_finish(); +#if USE_VK_COMPILER + glsl_type_singleton_decref(); +#endif + if (unlikely(!list_is_empty(&instance->debug_utils.callbacks))) { list_for_each_entry_safe(struct vk_debug_utils_messenger, messenger, &instance->debug_utils.callbacks, link) { diff --git a/src/vulkan/util/vk_util.c b/src/vulkan/util/vk_util.c index afd009e26d5..841212034ec 100644 --- a/src/vulkan/util/vk_util.c +++ b/src/vulkan/util/vk_util.c @@ -29,7 +29,6 @@ #include "vk_util.h" #include "util/u_debug.h" -#include "compiler/glsl_types.h" #include "compiler/spirv/nir_spirv.h" uint32_t vk_get_driver_version(void) @@ -142,19 +141,3 @@ vk_spec_info_to_nir_spirv(const VkSpecializationInfo *spec_info, *out_num_spec_entries = num_spec_entries; return spec_entries; } - -void -vk_compiler_cache_init(void) -{ -#if USE_VK_COMPILER - glsl_type_singleton_init_or_ref(); -#endif -} - -void -vk_compiler_cache_finish(void) -{ -#if USE_VK_COMPILER - glsl_type_singleton_decref(); -#endif -} diff --git a/src/vulkan/util/vk_util.h b/src/vulkan/util/vk_util.h index e1aef150c72..85807f410fa 100644 --- a/src/vulkan/util/vk_util.h +++ b/src/vulkan/util/vk_util.h @@ -316,12 +316,6 @@ struct vk_pipeline_cache_header { memcpy((dest), (src), (count) * sizeof(*(src))); \ } while (0) -void -vk_compiler_cache_init(void); - -void -vk_compiler_cache_finish(void); - static inline gl_shader_stage vk_to_mesa_shader_stage(VkShaderStageFlagBits vk_stage) { |