From 06fa90e14eb7d9182ada1b91f360fcbbd6a61c01 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 7 Mar 2023 12:26:45 +0100 Subject: [PATCH] radv: move instance related code to radv_instance.c radv_device.c is getting too big and this follows the Vulkan common runtime infrastructure. Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/meson.build | 1 + src/amd/vulkan/radv_device.c | 401 +-------------------------------------- src/amd/vulkan/radv_instance.c | 417 +++++++++++++++++++++++++++++++++++++++++ src/amd/vulkan/radv_private.h | 13 ++ 4 files changed, 435 insertions(+), 397 deletions(-) create mode 100644 src/amd/vulkan/radv_instance.c diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index d3c3d4a..63b348b 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -71,6 +71,7 @@ libradv_files = files( 'radv_device_generated_commands.c', 'radv_formats.c', 'radv_image.c', + 'radv_instance.c', 'radv_meta.c', 'radv_meta.h', 'radv_meta_blit.c', diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 100ad73..c719fb2 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -440,56 +440,6 @@ radv_NV_device_generated_commands_enabled(const struct radv_physical_device *dev driQueryOptionb(&device->instance->dri_options, "radv_dgc"); } -#ifdef ANDROID -#define RADV_API_VERSION VK_MAKE_VERSION(1, 1, VK_HEADER_VERSION) -#else -#define RADV_API_VERSION VK_MAKE_VERSION(1, 3, VK_HEADER_VERSION) -#endif - -VKAPI_ATTR VkResult VKAPI_CALL -radv_EnumerateInstanceVersion(uint32_t *pApiVersion) -{ - *pApiVersion = RADV_API_VERSION; - return VK_SUCCESS; -} - -static const struct vk_instance_extension_table radv_instance_extensions_supported = { - .KHR_device_group_creation = true, - .KHR_external_fence_capabilities = true, - .KHR_external_memory_capabilities = true, - .KHR_external_semaphore_capabilities = true, - .KHR_get_physical_device_properties2 = true, - .EXT_debug_report = true, - .EXT_debug_utils = true, - -#ifdef RADV_USE_WSI_PLATFORM - .KHR_get_surface_capabilities2 = true, - .KHR_surface = true, - .KHR_surface_protected_capabilities = true, - .EXT_surface_maintenance1 = true, - .EXT_swapchain_colorspace = true, -#endif -#ifdef VK_USE_PLATFORM_WAYLAND_KHR - .KHR_wayland_surface = true, -#endif -#ifdef VK_USE_PLATFORM_XCB_KHR - .KHR_xcb_surface = true, -#endif -#ifdef VK_USE_PLATFORM_XLIB_KHR - .KHR_xlib_surface = true, -#endif -#ifdef VK_USE_PLATFORM_XLIB_XRANDR_EXT - .EXT_acquire_xlib_display = true, -#endif -#ifdef VK_USE_PLATFORM_DISPLAY_KHR - .KHR_display = true, - .KHR_get_display_properties2 = true, - .EXT_direct_mode_display = true, - .EXT_display_surface_counter = true, - .EXT_acquire_drm_display = true, -#endif -}; - static void radv_physical_device_get_supported_extensions(const struct radv_physical_device *device, struct vk_device_extension_table *ext) @@ -1044,7 +994,7 @@ fail_fd: return result; } -static void +void radv_physical_device_destroy(struct vk_physical_device *vk_device) { struct radv_physical_device *device = container_of(vk_device, struct radv_physical_device, vk); @@ -1061,251 +1011,7 @@ radv_physical_device_destroy(struct vk_physical_device *vk_device) vk_free(&device->instance->vk.alloc, device); } -static const struct debug_control radv_debug_options[] = { - {"nofastclears", RADV_DEBUG_NO_FAST_CLEARS}, - {"nodcc", RADV_DEBUG_NO_DCC}, - {"shaders", RADV_DEBUG_DUMP_SHADERS}, - {"nocache", RADV_DEBUG_NO_CACHE}, - {"shaderstats", RADV_DEBUG_DUMP_SHADER_STATS}, - {"nohiz", RADV_DEBUG_NO_HIZ}, - {"nocompute", RADV_DEBUG_NO_COMPUTE_QUEUE}, - {"allbos", RADV_DEBUG_ALL_BOS}, - {"noibs", RADV_DEBUG_NO_IBS}, - {"spirv", RADV_DEBUG_DUMP_SPIRV}, - {"vmfaults", RADV_DEBUG_VM_FAULTS}, - {"zerovram", RADV_DEBUG_ZERO_VRAM}, - {"syncshaders", RADV_DEBUG_SYNC_SHADERS}, - {"preoptir", RADV_DEBUG_PREOPTIR}, - {"nodynamicbounds", RADV_DEBUG_NO_DYNAMIC_BOUNDS}, - {"info", RADV_DEBUG_INFO}, - {"startup", RADV_DEBUG_STARTUP}, - {"checkir", RADV_DEBUG_CHECKIR}, - {"nobinning", RADV_DEBUG_NOBINNING}, - {"nongg", RADV_DEBUG_NO_NGG}, - {"metashaders", RADV_DEBUG_DUMP_META_SHADERS}, - {"nomemorycache", RADV_DEBUG_NO_MEMORY_CACHE}, - {"discardtodemote", RADV_DEBUG_DISCARD_TO_DEMOTE}, - {"llvm", RADV_DEBUG_LLVM}, - {"forcecompress", RADV_DEBUG_FORCE_COMPRESS}, - {"hang", RADV_DEBUG_HANG}, - {"img", RADV_DEBUG_IMG}, - {"noumr", RADV_DEBUG_NO_UMR}, - {"invariantgeom", RADV_DEBUG_INVARIANT_GEOM}, - {"splitfma", RADV_DEBUG_SPLIT_FMA}, - {"nodisplaydcc", RADV_DEBUG_NO_DISPLAY_DCC}, - {"notccompatcmask", RADV_DEBUG_NO_TC_COMPAT_CMASK}, - {"novrsflatshading", RADV_DEBUG_NO_VRS_FLAT_SHADING}, - {"noatocdithering", RADV_DEBUG_NO_ATOC_DITHERING}, - {"nonggc", RADV_DEBUG_NO_NGGC}, - {"prologs", RADV_DEBUG_DUMP_PROLOGS}, - {"nodma", RADV_DEBUG_NO_DMA_BLIT}, - {"epilogs", RADV_DEBUG_DUMP_EPILOGS}, - {"nofmask", RADV_DEBUG_NO_FMASK}, - {"shadowregs", RADV_DEBUG_SHADOW_REGS}, - {NULL, 0}}; - -const char * -radv_get_debug_option_name(int id) -{ - assert(id < ARRAY_SIZE(radv_debug_options) - 1); - return radv_debug_options[id].string; -} - -static const struct debug_control radv_perftest_options[] = {{"localbos", RADV_PERFTEST_LOCAL_BOS}, - {"dccmsaa", RADV_PERFTEST_DCC_MSAA}, - {"bolist", RADV_PERFTEST_BO_LIST}, - {"cswave32", RADV_PERFTEST_CS_WAVE_32}, - {"pswave32", RADV_PERFTEST_PS_WAVE_32}, - {"gewave32", RADV_PERFTEST_GE_WAVE_32}, - {"nosam", RADV_PERFTEST_NO_SAM}, - {"sam", RADV_PERFTEST_SAM}, - {"rt", RADV_PERFTEST_RT}, - {"nggc", RADV_PERFTEST_NGGC}, - {"emulate_rt", RADV_PERFTEST_EMULATE_RT}, - {"nv_ms", RADV_PERFTEST_NV_MS}, - {"rtwave64", RADV_PERFTEST_RT_WAVE_64}, - {"gpl", RADV_PERFTEST_GPL}, - {"ngg_streamout", RADV_PERFTEST_NGG_STREAMOUT}, - {"video_decode", RADV_PERFTEST_VIDEO_DECODE}, - {NULL, 0}}; - -const char * -radv_get_perftest_option_name(int id) -{ - assert(id < ARRAY_SIZE(radv_perftest_options) - 1); - return radv_perftest_options[id].string; -} - -// clang-format off -static const driOptionDescription radv_dri_options[] = { - DRI_CONF_SECTION_PERFORMANCE - DRI_CONF_ADAPTIVE_SYNC(true) - DRI_CONF_VK_X11_OVERRIDE_MIN_IMAGE_COUNT(0) - DRI_CONF_VK_X11_STRICT_IMAGE_COUNT(false) - DRI_CONF_VK_X11_ENSURE_MIN_IMAGE_COUNT(false) - DRI_CONF_VK_KHR_PRESENT_WAIT(false) - DRI_CONF_VK_XWAYLAND_WAIT_READY(true) - DRI_CONF_RADV_REPORT_LLVM9_VERSION_STRING(false) - DRI_CONF_RADV_ENABLE_MRT_OUTPUT_NAN_FIXUP(false) - DRI_CONF_RADV_DISABLE_SHRINK_IMAGE_STORE(false) - DRI_CONF_RADV_NO_DYNAMIC_BOUNDS(false) - DRI_CONF_RADV_ABSOLUTE_DEPTH_BIAS(false) - DRI_CONF_RADV_OVERRIDE_UNIFORM_OFFSET_ALIGNMENT(0) - DRI_CONF_SECTION_END - - DRI_CONF_SECTION_DEBUG - DRI_CONF_OVERRIDE_VRAM_SIZE() - DRI_CONF_VK_WSI_FORCE_BGRA8_UNORM_FIRST(false) - DRI_CONF_RADV_ZERO_VRAM(false) - DRI_CONF_RADV_LOWER_DISCARD_TO_DEMOTE(false) - DRI_CONF_RADV_INVARIANT_GEOM(false) - DRI_CONF_RADV_SPLIT_FMA(false) - DRI_CONF_RADV_DISABLE_TC_COMPAT_HTILE_GENERAL(false) - DRI_CONF_RADV_DISABLE_DCC(false) - DRI_CONF_RADV_REQUIRE_ETC2(false) - DRI_CONF_RADV_DISABLE_ANISO_SINGLE_LEVEL(false) - DRI_CONF_RADV_DISABLE_SINKING_LOAD_INPUT_FS(false) - DRI_CONF_RADV_DGC(false) - DRI_CONF_RADV_FLUSH_BEFORE_QUERY_COPY(false) - DRI_CONF_RADV_ENABLE_UNIFIED_HEAP_ON_APU(false) - DRI_CONF_RADV_TEX_NON_UNIFORM(false) - DRI_CONF_RADV_RT(false) - DRI_CONF_RADV_APP_LAYER() - DRI_CONF_SECTION_END -}; -// clang-format on - -static void -radv_init_dri_options(struct radv_instance *instance) -{ - driParseOptionInfo(&instance->available_dri_options, radv_dri_options, - ARRAY_SIZE(radv_dri_options)); - driParseConfigFiles(&instance->dri_options, &instance->available_dri_options, 0, "radv", NULL, NULL, - instance->vk.app_info.app_name, instance->vk.app_info.app_version, - instance->vk.app_info.engine_name, instance->vk.app_info.engine_version); - - instance->enable_mrt_output_nan_fixup = - driQueryOptionb(&instance->dri_options, "radv_enable_mrt_output_nan_fixup"); - - instance->disable_shrink_image_store = - driQueryOptionb(&instance->dri_options, "radv_disable_shrink_image_store"); - - instance->absolute_depth_bias = - driQueryOptionb(&instance->dri_options, "radv_absolute_depth_bias"); - - instance->disable_tc_compat_htile_in_general = - driQueryOptionb(&instance->dri_options, "radv_disable_tc_compat_htile_general"); - - if (driQueryOptionb(&instance->dri_options, "radv_no_dynamic_bounds")) - instance->debug_flags |= RADV_DEBUG_NO_DYNAMIC_BOUNDS; - - if (driQueryOptionb(&instance->dri_options, "radv_lower_discard_to_demote")) - instance->debug_flags |= RADV_DEBUG_DISCARD_TO_DEMOTE; - - if (driQueryOptionb(&instance->dri_options, "radv_invariant_geom")) - instance->debug_flags |= RADV_DEBUG_INVARIANT_GEOM; - - if (driQueryOptionb(&instance->dri_options, "radv_split_fma")) - instance->debug_flags |= RADV_DEBUG_SPLIT_FMA; - - if (driQueryOptionb(&instance->dri_options, "radv_disable_dcc")) - instance->debug_flags |= RADV_DEBUG_NO_DCC; - - instance->zero_vram = - driQueryOptionb(&instance->dri_options, "radv_zero_vram"); - - instance->disable_aniso_single_level = - driQueryOptionb(&instance->dri_options, "radv_disable_aniso_single_level"); - - instance->disable_sinking_load_input_fs = - driQueryOptionb(&instance->dri_options, "radv_disable_sinking_load_input_fs"); - - instance->flush_before_query_copy = - driQueryOptionb(&instance->dri_options, "radv_flush_before_query_copy"); - - instance->enable_unified_heap_on_apu = - driQueryOptionb(&instance->dri_options, "radv_enable_unified_heap_on_apu"); - - instance->tex_non_uniform = driQueryOptionb(&instance->dri_options, "radv_tex_non_uniform"); - - instance->app_layer = driQueryOptionstr(&instance->dri_options, "radv_app_layer"); -} - -static VkResult create_null_physical_device(struct vk_instance *vk_instance); - -static VkResult create_drm_physical_device(struct vk_instance *vk_instance, - struct _drmDevice *device, - struct vk_physical_device **out); - -VKAPI_ATTR VkResult VKAPI_CALL -radv_CreateInstance(const VkInstanceCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, VkInstance *pInstance) -{ - struct radv_instance *instance; - VkResult result; - - if (!pAllocator) - pAllocator = vk_default_allocator(); - - instance = vk_zalloc(pAllocator, sizeof(*instance), 8, VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); - if (!instance) - return vk_error(NULL, VK_ERROR_OUT_OF_HOST_MEMORY); - - struct vk_instance_dispatch_table dispatch_table; - vk_instance_dispatch_table_from_entrypoints(&dispatch_table, &radv_instance_entrypoints, true); - vk_instance_dispatch_table_from_entrypoints(&dispatch_table, &wsi_instance_entrypoints, false); - - result = vk_instance_init(&instance->vk, &radv_instance_extensions_supported, &dispatch_table, - pCreateInfo, pAllocator); - if (result != VK_SUCCESS) { - vk_free(pAllocator, instance); - return vk_error(instance, result); - } - - instance->debug_flags = parse_debug_string(getenv("RADV_DEBUG"), radv_debug_options); - instance->perftest_flags = parse_debug_string(getenv("RADV_PERFTEST"), radv_perftest_options); - - /* When RADV_FORCE_FAMILY is set, the driver creates a null - * device that allows to test the compiler without having an - * AMDGPU instance. - */ - if (getenv("RADV_FORCE_FAMILY")) - instance->vk.physical_devices.enumerate = create_null_physical_device; - else - instance->vk.physical_devices.try_create_for_drm = create_drm_physical_device; - - instance->vk.physical_devices.destroy = radv_physical_device_destroy; - - if (instance->debug_flags & RADV_DEBUG_STARTUP) - fprintf(stderr, "radv: info: Created an instance.\n"); - - VG(VALGRIND_CREATE_MEMPOOL(instance, 0, false)); - - radv_init_dri_options(instance); - - *pInstance = radv_instance_to_handle(instance); - - return VK_SUCCESS; -} - -VKAPI_ATTR void VKAPI_CALL -radv_DestroyInstance(VkInstance _instance, const VkAllocationCallbacks *pAllocator) -{ - RADV_FROM_HANDLE(radv_instance, instance, _instance); - - if (!instance) - return; - - VG(VALGRIND_DESTROY_MEMPOOL(instance)); - - driDestroyOptionCache(&instance->dri_options); - driDestroyOptionInfo(&instance->available_dri_options); - - vk_instance_finish(&instance->vk); - vk_free(&instance->vk.alloc, instance); -} - -static VkResult +VkResult create_null_physical_device(struct vk_instance *vk_instance) { struct radv_instance *instance = container_of(vk_instance, struct radv_instance, vk); @@ -1319,7 +1025,7 @@ create_null_physical_device(struct vk_instance *vk_instance) return VK_SUCCESS; } -static VkResult +VkResult create_drm_physical_device(struct vk_instance *vk_instance, struct _drmDevice *device, struct vk_physical_device **out) { @@ -4353,18 +4059,6 @@ radv_DestroyDevice(VkDevice _device, const VkAllocationCallbacks *pAllocator) vk_free(&device->vk.alloc, device); } -VKAPI_ATTR VkResult VKAPI_CALL -radv_EnumerateInstanceLayerProperties(uint32_t *pPropertyCount, VkLayerProperties *pProperties) -{ - if (pProperties == NULL) { - *pPropertyCount = 0; - return VK_SUCCESS; - } - - /* None supported at this time */ - return vk_error(NULL, VK_ERROR_LAYER_NOT_PRESENT); -} - static void radv_fill_shader_rings(struct radv_device *device, uint32_t *map, bool add_sample_positions, uint32_t esgs_ring_size, struct radeon_winsys_bo *esgs_ring_bo, @@ -6068,48 +5762,6 @@ radv_queue_internal_submit(struct radv_queue *queue, struct radeon_cmdbuf *cs) return true; } -VKAPI_ATTR VkResult VKAPI_CALL -radv_EnumerateInstanceExtensionProperties(const char *pLayerName, uint32_t *pPropertyCount, - VkExtensionProperties *pProperties) -{ - if (pLayerName) - return vk_error(NULL, VK_ERROR_LAYER_NOT_PRESENT); - - return vk_enumerate_instance_extension_properties(&radv_instance_extensions_supported, - pPropertyCount, pProperties); -} - -VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL -radv_GetInstanceProcAddr(VkInstance _instance, const char *pName) -{ - RADV_FROM_HANDLE(vk_instance, instance, _instance); - return vk_instance_get_proc_addr(instance, &radv_instance_entrypoints, pName); -} - -/* Windows will use a dll definition file to avoid build errors. */ -#ifdef _WIN32 -#undef PUBLIC -#define PUBLIC -#endif - -/* The loader wants us to expose a second GetInstanceProcAddr function - * to work around certain LD_PRELOAD issues seen in apps. - */ -PUBLIC -VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL -vk_icdGetInstanceProcAddr(VkInstance instance, const char *pName) -{ - return radv_GetInstanceProcAddr(instance, pName); -} - -PUBLIC -VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL -vk_icdGetPhysicalDeviceProcAddr(VkInstance _instance, const char *pName) -{ - RADV_FROM_HANDLE(radv_instance, instance, _instance); - return vk_instance_get_physical_device_proc_addr(&instance->vk, pName); -} - bool radv_get_memory_fd(struct radv_device *device, struct radv_device_memory *memory, int *pFD) { @@ -7848,52 +7500,7 @@ radv_DestroySampler(VkDevice _device, VkSampler _sampler, const VkAllocationCall vk_free2(&device->vk.alloc, pAllocator, sampler); } -PUBLIC VKAPI_ATTR VkResult VKAPI_CALL -vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *pSupportedVersion) -{ - /* For the full details on loader interface versioning, see - * . - * What follows is a condensed summary, to help you navigate the large and - * confusing official doc. - * - * - Loader interface v0 is incompatible with later versions. We don't - * support it. - * - * - In loader interface v1: - * - The first ICD entrypoint called by the loader is - * vk_icdGetInstanceProcAddr(). The ICD must statically expose this - * entrypoint. - * - The ICD must statically expose no other Vulkan symbol unless it is - * linked with -Bsymbolic. - * - Each dispatchable Vulkan handle created by the ICD must be - * a pointer to a struct whose first member is VK_LOADER_DATA. The - * ICD must initialize VK_LOADER_DATA.loadMagic to ICD_LOADER_MAGIC. - * - The loader implements vkCreate{PLATFORM}SurfaceKHR() and - * vkDestroySurfaceKHR(). The ICD must be capable of working with - * such loader-managed surfaces. - * - * - Loader interface v2 differs from v1 in: - * - The first ICD entrypoint called by the loader is - * vk_icdNegotiateLoaderICDInterfaceVersion(). The ICD must - * statically expose this entrypoint. - * - * - Loader interface v3 differs from v2 in: - * - The ICD must implement vkCreate{PLATFORM}SurfaceKHR(), - * vkDestroySurfaceKHR(), and other API which uses VKSurfaceKHR, - * because the loader no longer does so. - * - * - Loader interface v4 differs from v3 in: - * - The ICD must implement vk_icdGetPhysicalDeviceProcAddr(). - * - * - Loader interface v5 differs from v4 in: - * - The ICD must support Vulkan API version 1.1 and must not return - * VK_ERROR_INCOMPATIBLE_DRIVER from vkCreateInstance() unless a - * Vulkan Loader with interface v4 or smaller is being used and the - * application provides an API version that is greater than 1.0. - */ - *pSupportedVersion = MIN2(*pSupportedVersion, 5u); - return VK_SUCCESS; -} + VKAPI_ATTR VkResult VKAPI_CALL radv_GetMemoryFdKHR(VkDevice _device, const VkMemoryGetFdInfoKHR *pGetFdInfo, int *pFD) diff --git a/src/amd/vulkan/radv_instance.c b/src/amd/vulkan/radv_instance.c new file mode 100644 index 0000000..c65ff5c --- /dev/null +++ b/src/amd/vulkan/radv_instance.c @@ -0,0 +1,417 @@ +/* + * Copyright © 2016 Red Hat. + * Copyright © 2016 Bas Nieuwenhuizen + * + * based in part on anv driver which is: + * Copyright © 2015 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include "radv_debug.h" +#include "radv_private.h" + +#include "util/driconf.h" + +#include "vk_instance.h" +#include "vk_util.h" + +static const struct debug_control radv_debug_options[] = { + {"nofastclears", RADV_DEBUG_NO_FAST_CLEARS}, + {"nodcc", RADV_DEBUG_NO_DCC}, + {"shaders", RADV_DEBUG_DUMP_SHADERS}, + {"nocache", RADV_DEBUG_NO_CACHE}, + {"shaderstats", RADV_DEBUG_DUMP_SHADER_STATS}, + {"nohiz", RADV_DEBUG_NO_HIZ}, + {"nocompute", RADV_DEBUG_NO_COMPUTE_QUEUE}, + {"allbos", RADV_DEBUG_ALL_BOS}, + {"noibs", RADV_DEBUG_NO_IBS}, + {"spirv", RADV_DEBUG_DUMP_SPIRV}, + {"vmfaults", RADV_DEBUG_VM_FAULTS}, + {"zerovram", RADV_DEBUG_ZERO_VRAM}, + {"syncshaders", RADV_DEBUG_SYNC_SHADERS}, + {"preoptir", RADV_DEBUG_PREOPTIR}, + {"nodynamicbounds", RADV_DEBUG_NO_DYNAMIC_BOUNDS}, + {"info", RADV_DEBUG_INFO}, + {"startup", RADV_DEBUG_STARTUP}, + {"checkir", RADV_DEBUG_CHECKIR}, + {"nobinning", RADV_DEBUG_NOBINNING}, + {"nongg", RADV_DEBUG_NO_NGG}, + {"metashaders", RADV_DEBUG_DUMP_META_SHADERS}, + {"nomemorycache", RADV_DEBUG_NO_MEMORY_CACHE}, + {"discardtodemote", RADV_DEBUG_DISCARD_TO_DEMOTE}, + {"llvm", RADV_DEBUG_LLVM}, + {"forcecompress", RADV_DEBUG_FORCE_COMPRESS}, + {"hang", RADV_DEBUG_HANG}, + {"img", RADV_DEBUG_IMG}, + {"noumr", RADV_DEBUG_NO_UMR}, + {"invariantgeom", RADV_DEBUG_INVARIANT_GEOM}, + {"splitfma", RADV_DEBUG_SPLIT_FMA}, + {"nodisplaydcc", RADV_DEBUG_NO_DISPLAY_DCC}, + {"notccompatcmask", RADV_DEBUG_NO_TC_COMPAT_CMASK}, + {"novrsflatshading", RADV_DEBUG_NO_VRS_FLAT_SHADING}, + {"noatocdithering", RADV_DEBUG_NO_ATOC_DITHERING}, + {"nonggc", RADV_DEBUG_NO_NGGC}, + {"prologs", RADV_DEBUG_DUMP_PROLOGS}, + {"nodma", RADV_DEBUG_NO_DMA_BLIT}, + {"epilogs", RADV_DEBUG_DUMP_EPILOGS}, + {"nofmask", RADV_DEBUG_NO_FMASK}, + {"shadowregs", RADV_DEBUG_SHADOW_REGS}, + {NULL, 0}}; + +const char * +radv_get_debug_option_name(int id) +{ + assert(id < ARRAY_SIZE(radv_debug_options) - 1); + return radv_debug_options[id].string; +} + +static const struct debug_control radv_perftest_options[] = { + {"localbos", RADV_PERFTEST_LOCAL_BOS}, + {"dccmsaa", RADV_PERFTEST_DCC_MSAA}, + {"bolist", RADV_PERFTEST_BO_LIST}, + {"cswave32", RADV_PERFTEST_CS_WAVE_32}, + {"pswave32", RADV_PERFTEST_PS_WAVE_32}, + {"gewave32", RADV_PERFTEST_GE_WAVE_32}, + {"nosam", RADV_PERFTEST_NO_SAM}, + {"sam", RADV_PERFTEST_SAM}, + {"rt", RADV_PERFTEST_RT}, + {"nggc", RADV_PERFTEST_NGGC}, + {"emulate_rt", RADV_PERFTEST_EMULATE_RT}, + {"nv_ms", RADV_PERFTEST_NV_MS}, + {"rtwave64", RADV_PERFTEST_RT_WAVE_64}, + {"gpl", RADV_PERFTEST_GPL}, + {"ngg_streamout", RADV_PERFTEST_NGG_STREAMOUT}, + {"video_decode", RADV_PERFTEST_VIDEO_DECODE}, + {NULL, 0}}; + +const char * +radv_get_perftest_option_name(int id) +{ + assert(id < ARRAY_SIZE(radv_perftest_options) - 1); + return radv_perftest_options[id].string; +} + +// clang-format off +static const driOptionDescription radv_dri_options[] = { + DRI_CONF_SECTION_PERFORMANCE + DRI_CONF_ADAPTIVE_SYNC(true) + DRI_CONF_VK_X11_OVERRIDE_MIN_IMAGE_COUNT(0) + DRI_CONF_VK_X11_STRICT_IMAGE_COUNT(false) + DRI_CONF_VK_X11_ENSURE_MIN_IMAGE_COUNT(false) + DRI_CONF_VK_KHR_PRESENT_WAIT(false) + DRI_CONF_VK_XWAYLAND_WAIT_READY(true) + DRI_CONF_RADV_REPORT_LLVM9_VERSION_STRING(false) + DRI_CONF_RADV_ENABLE_MRT_OUTPUT_NAN_FIXUP(false) + DRI_CONF_RADV_DISABLE_SHRINK_IMAGE_STORE(false) + DRI_CONF_RADV_NO_DYNAMIC_BOUNDS(false) + DRI_CONF_RADV_ABSOLUTE_DEPTH_BIAS(false) + DRI_CONF_RADV_OVERRIDE_UNIFORM_OFFSET_ALIGNMENT(0) + DRI_CONF_SECTION_END + + DRI_CONF_SECTION_DEBUG + DRI_CONF_OVERRIDE_VRAM_SIZE() + DRI_CONF_VK_WSI_FORCE_BGRA8_UNORM_FIRST(false) + DRI_CONF_RADV_ZERO_VRAM(false) + DRI_CONF_RADV_LOWER_DISCARD_TO_DEMOTE(false) + DRI_CONF_RADV_INVARIANT_GEOM(false) + DRI_CONF_RADV_SPLIT_FMA(false) + DRI_CONF_RADV_DISABLE_TC_COMPAT_HTILE_GENERAL(false) + DRI_CONF_RADV_DISABLE_DCC(false) + DRI_CONF_RADV_REQUIRE_ETC2(false) + DRI_CONF_RADV_DISABLE_ANISO_SINGLE_LEVEL(false) + DRI_CONF_RADV_DISABLE_SINKING_LOAD_INPUT_FS(false) + DRI_CONF_RADV_DGC(false) + DRI_CONF_RADV_FLUSH_BEFORE_QUERY_COPY(false) + DRI_CONF_RADV_ENABLE_UNIFIED_HEAP_ON_APU(false) + DRI_CONF_RADV_TEX_NON_UNIFORM(false) + DRI_CONF_RADV_RT(false) + DRI_CONF_RADV_APP_LAYER() + DRI_CONF_SECTION_END +}; +// clang-format on + +static void +radv_init_dri_options(struct radv_instance *instance) +{ + driParseOptionInfo(&instance->available_dri_options, radv_dri_options, + ARRAY_SIZE(radv_dri_options)); + driParseConfigFiles(&instance->dri_options, &instance->available_dri_options, 0, "radv", NULL, + NULL, instance->vk.app_info.app_name, instance->vk.app_info.app_version, + instance->vk.app_info.engine_name, instance->vk.app_info.engine_version); + + instance->enable_mrt_output_nan_fixup = + driQueryOptionb(&instance->dri_options, "radv_enable_mrt_output_nan_fixup"); + + instance->disable_shrink_image_store = + driQueryOptionb(&instance->dri_options, "radv_disable_shrink_image_store"); + + instance->absolute_depth_bias = + driQueryOptionb(&instance->dri_options, "radv_absolute_depth_bias"); + + instance->disable_tc_compat_htile_in_general = + driQueryOptionb(&instance->dri_options, "radv_disable_tc_compat_htile_general"); + + if (driQueryOptionb(&instance->dri_options, "radv_no_dynamic_bounds")) + instance->debug_flags |= RADV_DEBUG_NO_DYNAMIC_BOUNDS; + + if (driQueryOptionb(&instance->dri_options, "radv_lower_discard_to_demote")) + instance->debug_flags |= RADV_DEBUG_DISCARD_TO_DEMOTE; + + if (driQueryOptionb(&instance->dri_options, "radv_invariant_geom")) + instance->debug_flags |= RADV_DEBUG_INVARIANT_GEOM; + + if (driQueryOptionb(&instance->dri_options, "radv_split_fma")) + instance->debug_flags |= RADV_DEBUG_SPLIT_FMA; + + if (driQueryOptionb(&instance->dri_options, "radv_disable_dcc")) + instance->debug_flags |= RADV_DEBUG_NO_DCC; + + instance->zero_vram = driQueryOptionb(&instance->dri_options, "radv_zero_vram"); + + instance->disable_aniso_single_level = + driQueryOptionb(&instance->dri_options, "radv_disable_aniso_single_level"); + + instance->disable_sinking_load_input_fs = + driQueryOptionb(&instance->dri_options, "radv_disable_sinking_load_input_fs"); + + instance->flush_before_query_copy = + driQueryOptionb(&instance->dri_options, "radv_flush_before_query_copy"); + + instance->enable_unified_heap_on_apu = + driQueryOptionb(&instance->dri_options, "radv_enable_unified_heap_on_apu"); + + instance->tex_non_uniform = driQueryOptionb(&instance->dri_options, "radv_tex_non_uniform"); + + instance->app_layer = driQueryOptionstr(&instance->dri_options, "radv_app_layer"); +} + +static const struct vk_instance_extension_table radv_instance_extensions_supported = { + .KHR_device_group_creation = true, + .KHR_external_fence_capabilities = true, + .KHR_external_memory_capabilities = true, + .KHR_external_semaphore_capabilities = true, + .KHR_get_physical_device_properties2 = true, + .EXT_debug_report = true, + .EXT_debug_utils = true, + +#ifdef RADV_USE_WSI_PLATFORM + .KHR_get_surface_capabilities2 = true, + .KHR_surface = true, + .KHR_surface_protected_capabilities = true, + .EXT_surface_maintenance1 = true, + .EXT_swapchain_colorspace = true, +#endif +#ifdef VK_USE_PLATFORM_WAYLAND_KHR + .KHR_wayland_surface = true, +#endif +#ifdef VK_USE_PLATFORM_XCB_KHR + .KHR_xcb_surface = true, +#endif +#ifdef VK_USE_PLATFORM_XLIB_KHR + .KHR_xlib_surface = true, +#endif +#ifdef VK_USE_PLATFORM_XLIB_XRANDR_EXT + .EXT_acquire_xlib_display = true, +#endif +#ifdef VK_USE_PLATFORM_DISPLAY_KHR + .KHR_display = true, + .KHR_get_display_properties2 = true, + .EXT_direct_mode_display = true, + .EXT_display_surface_counter = true, + .EXT_acquire_drm_display = true, +#endif +}; + +VKAPI_ATTR VkResult VKAPI_CALL +radv_CreateInstance(const VkInstanceCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, VkInstance *pInstance) +{ + struct radv_instance *instance; + VkResult result; + + if (!pAllocator) + pAllocator = vk_default_allocator(); + + instance = vk_zalloc(pAllocator, sizeof(*instance), 8, VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); + if (!instance) + return vk_error(NULL, VK_ERROR_OUT_OF_HOST_MEMORY); + + struct vk_instance_dispatch_table dispatch_table; + vk_instance_dispatch_table_from_entrypoints(&dispatch_table, &radv_instance_entrypoints, true); + vk_instance_dispatch_table_from_entrypoints(&dispatch_table, &wsi_instance_entrypoints, false); + + result = vk_instance_init(&instance->vk, &radv_instance_extensions_supported, &dispatch_table, + pCreateInfo, pAllocator); + if (result != VK_SUCCESS) { + vk_free(pAllocator, instance); + return vk_error(instance, result); + } + + instance->debug_flags = parse_debug_string(getenv("RADV_DEBUG"), radv_debug_options); + instance->perftest_flags = parse_debug_string(getenv("RADV_PERFTEST"), radv_perftest_options); + + /* When RADV_FORCE_FAMILY is set, the driver creates a null + * device that allows to test the compiler without having an + * AMDGPU instance. + */ + if (getenv("RADV_FORCE_FAMILY")) + instance->vk.physical_devices.enumerate = create_null_physical_device; + else + instance->vk.physical_devices.try_create_for_drm = create_drm_physical_device; + + instance->vk.physical_devices.destroy = radv_physical_device_destroy; + + if (instance->debug_flags & RADV_DEBUG_STARTUP) + fprintf(stderr, "radv: info: Created an instance.\n"); + + VG(VALGRIND_CREATE_MEMPOOL(instance, 0, false)); + + radv_init_dri_options(instance); + + *pInstance = radv_instance_to_handle(instance); + + return VK_SUCCESS; +} + +VKAPI_ATTR void VKAPI_CALL +radv_DestroyInstance(VkInstance _instance, const VkAllocationCallbacks *pAllocator) +{ + RADV_FROM_HANDLE(radv_instance, instance, _instance); + + if (!instance) + return; + + VG(VALGRIND_DESTROY_MEMPOOL(instance)); + + driDestroyOptionCache(&instance->dri_options); + driDestroyOptionInfo(&instance->available_dri_options); + + vk_instance_finish(&instance->vk); + vk_free(&instance->vk.alloc, instance); +} + +VKAPI_ATTR VkResult VKAPI_CALL +radv_EnumerateInstanceExtensionProperties(const char *pLayerName, uint32_t *pPropertyCount, + VkExtensionProperties *pProperties) +{ + if (pLayerName) + return vk_error(NULL, VK_ERROR_LAYER_NOT_PRESENT); + + return vk_enumerate_instance_extension_properties(&radv_instance_extensions_supported, + pPropertyCount, pProperties); +} + +VKAPI_ATTR VkResult VKAPI_CALL +radv_EnumerateInstanceVersion(uint32_t *pApiVersion) +{ + *pApiVersion = RADV_API_VERSION; + return VK_SUCCESS; +} + +VKAPI_ATTR VkResult VKAPI_CALL +radv_EnumerateInstanceLayerProperties(uint32_t *pPropertyCount, VkLayerProperties *pProperties) +{ + if (pProperties == NULL) { + *pPropertyCount = 0; + return VK_SUCCESS; + } + + /* None supported at this time */ + return vk_error(NULL, VK_ERROR_LAYER_NOT_PRESENT); +} + +VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL +radv_GetInstanceProcAddr(VkInstance _instance, const char *pName) +{ + RADV_FROM_HANDLE(vk_instance, instance, _instance); + return vk_instance_get_proc_addr(instance, &radv_instance_entrypoints, pName); +} + +/* Windows will use a dll definition file to avoid build errors. */ +#ifdef _WIN32 +#undef PUBLIC +#define PUBLIC +#endif + +PUBLIC VKAPI_ATTR VkResult VKAPI_CALL +vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *pSupportedVersion) +{ + /* For the full details on loader interface versioning, see + * . + * What follows is a condensed summary, to help you navigate the large and + * confusing official doc. + * + * - Loader interface v0 is incompatible with later versions. We don't + * support it. + * + * - In loader interface v1: + * - The first ICD entrypoint called by the loader is + * vk_icdGetInstanceProcAddr(). The ICD must statically expose this + * entrypoint. + * - The ICD must statically expose no other Vulkan symbol unless it is + * linked with -Bsymbolic. + * - Each dispatchable Vulkan handle created by the ICD must be + * a pointer to a struct whose first member is VK_LOADER_DATA. The + * ICD must initialize VK_LOADER_DATA.loadMagic to ICD_LOADER_MAGIC. + * - The loader implements vkCreate{PLATFORM}SurfaceKHR() and + * vkDestroySurfaceKHR(). The ICD must be capable of working with + * such loader-managed surfaces. + * + * - Loader interface v2 differs from v1 in: + * - The first ICD entrypoint called by the loader is + * vk_icdNegotiateLoaderICDInterfaceVersion(). The ICD must + * statically expose this entrypoint. + * + * - Loader interface v3 differs from v2 in: + * - The ICD must implement vkCreate{PLATFORM}SurfaceKHR(), + * vkDestroySurfaceKHR(), and other API which uses VKSurfaceKHR, + * because the loader no longer does so. + * + * - Loader interface v4 differs from v3 in: + * - The ICD must implement vk_icdGetPhysicalDeviceProcAddr(). + * + * - Loader interface v5 differs from v4 in: + * - The ICD must support Vulkan API version 1.1 and must not return + * VK_ERROR_INCOMPATIBLE_DRIVER from vkCreateInstance() unless a + * Vulkan Loader with interface v4 or smaller is being used and the + * application provides an API version that is greater than 1.0. + */ + *pSupportedVersion = MIN2(*pSupportedVersion, 5u); + return VK_SUCCESS; +} + +/* The loader wants us to expose a second GetInstanceProcAddr function + * to work around certain LD_PRELOAD issues seen in apps. + */ +PUBLIC +VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL +vk_icdGetInstanceProcAddr(VkInstance instance, const char *pName) +{ + return radv_GetInstanceProcAddr(instance, pName); +} + +PUBLIC +VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL +vk_icdGetPhysicalDeviceProcAddr(VkInstance _instance, const char *pName) +{ + RADV_FROM_HANDLE(radv_instance, instance, _instance); + return vk_instance_get_physical_device_proc_addr(&instance->vk, pName); +} diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index 5c4d2ff..945b3f5 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -127,6 +127,12 @@ extern "C" #define RADV_USE_WSI_PLATFORM #endif +#ifdef ANDROID +#define RADV_API_VERSION VK_MAKE_VERSION(1, 1, VK_HEADER_VERSION) +#else +#define RADV_API_VERSION VK_MAKE_VERSION(1, 3, VK_HEADER_VERSION) +#endif + #ifdef _WIN32 #define RADV_SUPPORT_CALIBRATED_TIMESTAMPS 0 #else @@ -365,6 +371,13 @@ struct radv_physical_device { uint32_t radv_find_memory_index(struct radv_physical_device *pdevice, VkMemoryPropertyFlags flags); +VkResult create_null_physical_device(struct vk_instance *vk_instance); + +VkResult create_drm_physical_device(struct vk_instance *vk_instance, struct _drmDevice *device, + struct vk_physical_device **out); + +void radv_physical_device_destroy(struct vk_physical_device *vk_device); + struct radv_instance { struct vk_instance vk; -- 2.7.4