Fix exported extension functions
Only core functions and WSI extension functions should be exported:
https://github.com/KhronosGroup/Vulkan-Loader/blob/master/loader/LoaderAndLayerInterface.md#vulkan-direct-exports
Bug: b/148240133
Change-Id: I4960fae2bb93129a5df61ce253eb5e2e44d6a739
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/57290
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
diff --git a/src/Vulkan/vk_swiftshader.def b/src/Vulkan/vk_swiftshader.def
index f2f7105..bb09a1e 100644
--- a/src/Vulkan/vk_swiftshader.def
+++ b/src/Vulkan/vk_swiftshader.def
@@ -4,7 +4,7 @@
vk_icdGetInstanceProcAddr
vk_icdNegotiateLoaderICDInterfaceVersion
- ; Optional Vulkan API entry functions
+ ; Vulkan 1.0 API entry functions
vkCreateInstance
vkDestroyInstance
vkEnumeratePhysicalDevices
@@ -142,108 +142,91 @@
vkCmdNextSubpass
vkCmdEndRenderPass
vkCmdExecuteCommands
+ vkDestroySurfaceKHR
+ vkGetPhysicalDeviceSurfaceSupportKHR
+ vkGetPhysicalDeviceSurfaceCapabilitiesKHR
+ vkGetPhysicalDeviceSurfaceFormatsKHR
+
+ ; VK_KHR_get_surface_capabilities2
+ ;vkGetPhysicalDeviceSurfaceCapabilities2KHR
+ ;vkGetPhysicalDeviceSurfaceFormats2KHR
+
+ ; VK_KHR_surface
+ vkGetPhysicalDeviceSurfacePresentModesKHR
+ vkCreateSwapchainKHR
+ vkDestroySwapchainKHR
+ vkGetSwapchainImagesKHR
+ vkAcquireNextImageKHR
+ vkQueuePresentKHR
+
+ ; VK_KHR_display
+ ;vkGetPhysicalDeviceDisplayPropertiesKHR
+ ;vkGetPhysicalDeviceDisplayPlanePropertiesKHR
+ ;vkGetDisplayPlaneSupportedDisplaysKHR
+ ;vkGetDisplayModePropertiesKHR
+ ;vkCreateDisplayModeKHR
+ ;vkGetDisplayPlaneCapabilitiesKHR
+ ;vkCreateDisplayPlaneSurfaceKHR
+
+ ; VK_KHR_display_swapchain
+ ;vkCreateSharedSwapchainsKHR
+
+ ; VK_KHR_win32_surface
+ vkCreateWin32SurfaceKHR
+ vkGetPhysicalDeviceWin32PresentationSupportKHR
+
+ ; Vulkan 1.1 API entry functions
vkEnumerateInstanceVersion
+ vkEnumeratePhysicalDeviceGroups
+ vkGetPhysicalDeviceFeatures2
+ vkGetPhysicalDeviceProperties2
+ vkGetPhysicalDeviceFormatProperties2
+ vkGetPhysicalDeviceQueueFamilyProperties2
+ vkGetPhysicalDeviceMemoryProperties2
+ vkGetPhysicalDeviceSparseImageFormatProperties2
+ vkGetPhysicalDeviceExternalBufferProperties
+ vkGetPhysicalDeviceExternalSemaphoreProperties
+ vkGetPhysicalDeviceExternalFenceProperties
vkBindBufferMemory2
vkBindImageMemory2
vkGetDeviceGroupPeerMemoryFeatures
vkCmdSetDeviceMask
vkCmdDispatchBase
- vkEnumeratePhysicalDeviceGroups
vkGetImageMemoryRequirements2
vkGetBufferMemoryRequirements2
- vkGetImageSparseMemoryRequirements2
- vkGetPhysicalDeviceFeatures2
- vkGetPhysicalDeviceProperties2
- vkGetPhysicalDeviceFormatProperties2
- vkGetPhysicalDeviceImageFormatProperties2
- vkGetPhysicalDeviceQueueFamilyProperties2
- vkGetPhysicalDeviceMemoryProperties2
- vkGetPhysicalDeviceSparseImageFormatProperties2
vkTrimCommandPool
vkGetDeviceQueue2
vkCreateSamplerYcbcrConversion
vkDestroySamplerYcbcrConversion
+ vkGetDescriptorSetLayoutSupport
+ vkGetDeviceGroupPresentCapabilitiesKHR
+ vkGetDeviceGroupSurfacePresentModesKHR
+ vkGetPhysicalDevicePresentRectanglesKHR
+ vkAcquireNextImage2KHR
vkCreateDescriptorUpdateTemplate
vkDestroyDescriptorUpdateTemplate
vkUpdateDescriptorSetWithTemplate
- vkGetPhysicalDeviceExternalBufferProperties
- vkGetPhysicalDeviceExternalFenceProperties
- vkGetPhysicalDeviceExternalSemaphoreProperties
- vkGetDescriptorSetLayoutSupport
- ; VK_KHR_bind_memory2
- vkBindBufferMemory2KHR
- vkBindImageMemory2KHR
- ; VK_KHR_descriptor_update_template
- vkCreateDescriptorUpdateTemplateKHR
- vkDestroyDescriptorUpdateTemplateKHR
- vkUpdateDescriptorSetWithTemplateKHR
- ; VK_KHR_device_group
- vkGetDeviceGroupPeerMemoryFeaturesKHR
- vkCmdSetDeviceMaskKHR
- vkCmdDispatchBaseKHR
- ; VK_KHR_device_group_creation
- vkEnumeratePhysicalDeviceGroupsKHR
- ; VK_KHR_external_fence_capabilities
- vkGetPhysicalDeviceExternalFencePropertiesKHR
- ; VK_KHR_external_memory_capabilities
- vkGetPhysicalDeviceExternalBufferPropertiesKHR
- ; VK_KHR_external_semaphore_capabilities
- vkGetPhysicalDeviceExternalSemaphorePropertiesKHR
- ; VK_KHR_get_memory_requirements2
- vkGetImageMemoryRequirements2KHR
- vkGetBufferMemoryRequirements2KHR
- vkGetImageSparseMemoryRequirements2KHR
- ; VK_KHR_get_physical_device_properties2
- vkGetPhysicalDeviceFeatures2KHR
- vkGetPhysicalDeviceProperties2KHR
- vkGetPhysicalDeviceFormatProperties2KHR
- vkGetPhysicalDeviceImageFormatProperties2KHR
- vkGetPhysicalDeviceQueueFamilyProperties2KHR
- vkGetPhysicalDeviceMemoryProperties2KHR
- vkGetPhysicalDeviceSparseImageFormatProperties2KHR
- ; VK_EXT_debug_utils
- vkCmdBeginDebugUtilsLabelEXT
- vkCmdEndDebugUtilsLabelEXT
- vkCmdInsertDebugUtilsLabelEXT
- vkCreateDebugUtilsMessengerEXT
- vkDestroyDebugUtilsMessengerEXT
- vkQueueBeginDebugUtilsLabelEXT
- vkQueueEndDebugUtilsLabelEXT
- vkQueueInsertDebugUtilsLabelEXT
- vkSetDebugUtilsObjectNameEXT
- vkSetDebugUtilsObjectTagEXT
- vkSubmitDebugUtilsMessageEXT
- ; VK_KHR_maintenance1
- vkTrimCommandPoolKHR
- ; VK_KHR_maintenance3
- vkGetDescriptorSetLayoutSupportKHR
- ; VK_KHR_sampler_ycbcr_conversion
- vkCreateSamplerYcbcrConversionKHR
- vkDestroySamplerYcbcrConversionKHR
- ; VK_KHR_surface
- vkDestroySurfaceKHR
- vkGetPhysicalDeviceSurfaceSupportKHR
- vkGetPhysicalDeviceSurfaceCapabilitiesKHR
- vkGetPhysicalDeviceSurfaceFormatsKHR
- vkGetPhysicalDeviceSurfacePresentModesKHR
- ; VK_KHR_timeline_semaphore
+
+ ; VK_KHR_get_display_properties2
+ ;vkGetPhysicalDeviceDisplayProperties2KHR
+ ;vkGetPhysicalDeviceDisplayPlaneProperties2KHR
+ ;vkGetDisplayModeProperties2KHR
+ ;vkGetDisplayPlaneCapabilities2KHR
+
+ ; Vulkan 1.2 API entry functions
+ vkGetImageSparseMemoryRequirements2
+ vkGetPhysicalDeviceImageFormatProperties2
+
+ vkCreateRenderPass2
+ vkCmdBeginRenderPass2
+ vkCmdNextSubpass2
+ vkCmdEndRenderPass2
+ vkCmdDrawIndirectCount
+ vkCmdDrawIndexedIndirectCount
vkGetSemaphoreCounterValue
- vkSignalSemaphore
vkWaitSemaphores
- vkGetSemaphoreCounterValueKHR
- vkSignalSemaphoreKHR
- vkWaitSemaphoresKHR
- ; VK_KHR_win32_surface
- vkCreateWin32SurfaceKHR
- vkGetPhysicalDeviceWin32PresentationSupportKHR
- ; VK_EXT_host_query_reset
- vkResetQueryPool
- ; VK_EXT_headless_surface
- vkCreateHeadlessSurfaceEXT
- ; VK_KHR_buffer_device_address
+ vkSignalSemaphore
vkGetBufferDeviceAddress
vkGetBufferOpaqueCaptureAddress
vkGetDeviceMemoryOpaqueCaptureAddress
- ; VK_KHR_draw_indirect_count
- vkCmdDrawIndirectCount
- vkCmdDrawIndexedIndirectCount
+ vkResetQueryPool
diff --git a/src/Vulkan/vk_swiftshader.exports b/src/Vulkan/vk_swiftshader.exports
index d147e8a..1153f00 100644
--- a/src/Vulkan/vk_swiftshader.exports
+++ b/src/Vulkan/vk_swiftshader.exports
@@ -7,6 +7,3 @@
# Type-strings and type-infos required by sanitizers
_ZTS*
_ZTI*
-
-# Android HAL module info object
-#HMI
diff --git a/src/Vulkan/vk_swiftshader.lds b/src/Vulkan/vk_swiftshader.lds
index 508f786..058e6d1 100644
--- a/src/Vulkan/vk_swiftshader.lds
+++ b/src/Vulkan/vk_swiftshader.lds
@@ -4,7 +4,7 @@
vk_icdGetInstanceProcAddr;
vk_icdNegotiateLoaderICDInterfaceVersion;
- # Optional Vulkan API entry functions
+ # Vulkan 1.0 API entry functions
vkCreateInstance;
vkDestroyInstance;
vkEnumeratePhysicalDevices;
@@ -142,112 +142,107 @@
vkCmdNextSubpass;
vkCmdEndRenderPass;
vkCmdExecuteCommands;
+ vkDestroySurfaceKHR;
+ vkGetPhysicalDeviceSurfaceSupportKHR;
+ vkGetPhysicalDeviceSurfaceCapabilitiesKHR;
+ vkGetPhysicalDeviceSurfaceFormatsKHR;
+
+ # VK_KHR_get_surface_capabilities2
+ #vkGetPhysicalDeviceSurfaceCapabilities2KHR;
+ #vkGetPhysicalDeviceSurfaceFormats2KHR;
+
+ # VK_KHR_surface
+ vkGetPhysicalDeviceSurfacePresentModesKHR;
+ vkCreateSwapchainKHR;
+ vkDestroySwapchainKHR;
+ vkGetSwapchainImagesKHR;
+ vkAcquireNextImageKHR;
+ vkQueuePresentKHR;
+
+ # VK_KHR_display
+ #vkGetPhysicalDeviceDisplayPropertiesKHR;
+ #vkGetPhysicalDeviceDisplayPlanePropertiesKHR;
+ #vkGetDisplayPlaneSupportedDisplaysKHR;
+ #vkGetDisplayModePropertiesKHR;
+ #vkCreateDisplayModeKHR;
+ #vkGetDisplayPlaneCapabilitiesKHR;
+ #vkCreateDisplayPlaneSurfaceKHR;
+
+ # VK_KHR_display_swapchain
+ #vkCreateSharedSwapchainsKHR;
+
+ # VK_KHR_Xcb_surface
+ vkCreateXcbSurfaceKHR;
+ vkGetPhysicalDeviceXcbPresentationSupportKHR;
+
+ # VK_KHR_xlib_surface
+ vkCreateXlibSurfaceKHR;
+ vkGetPhysicalDeviceXlibPresentationSupportKHR;
+
+ # VK_KHR_wayland_surface
+ vkCreateWaylandSurfaceKHR;
+ vkGetPhysicalDeviceWaylandPresentationSupportKHR;
+
+ # VK_EXT_directfb_surface
+ vkCreateDirectFBSurfaceEXT;
+ vkGetPhysicalDeviceDirectFBPresentationSupportEXT;
+
+ # Vulkan 1.1 API entry functions
vkEnumerateInstanceVersion;
+ vkEnumeratePhysicalDeviceGroups;
+ vkGetPhysicalDeviceFeatures2;
+ vkGetPhysicalDeviceProperties2;
+ vkGetPhysicalDeviceFormatProperties2;
+ vkGetPhysicalDeviceQueueFamilyProperties2;
+ vkGetPhysicalDeviceMemoryProperties2;
+ vkGetPhysicalDeviceSparseImageFormatProperties2;
+ vkGetPhysicalDeviceExternalBufferProperties;
+ vkGetPhysicalDeviceExternalSemaphoreProperties;
+ vkGetPhysicalDeviceExternalFenceProperties;
vkBindBufferMemory2;
vkBindImageMemory2;
vkGetDeviceGroupPeerMemoryFeatures;
vkCmdSetDeviceMask;
vkCmdDispatchBase;
- vkEnumeratePhysicalDeviceGroups;
vkGetImageMemoryRequirements2;
vkGetBufferMemoryRequirements2;
- vkGetImageSparseMemoryRequirements2;
- vkGetPhysicalDeviceFeatures2;
- vkGetPhysicalDeviceProperties2;
- vkGetPhysicalDeviceFormatProperties2;
- vkGetPhysicalDeviceImageFormatProperties2;
- vkGetPhysicalDeviceQueueFamilyProperties2;
- vkGetPhysicalDeviceMemoryProperties2;
- vkGetPhysicalDeviceSparseImageFormatProperties2;
vkTrimCommandPool;
vkGetDeviceQueue2;
vkCreateSamplerYcbcrConversion;
vkDestroySamplerYcbcrConversion;
+ vkGetDescriptorSetLayoutSupport;
+ vkGetDeviceGroupPresentCapabilitiesKHR;
+ vkGetDeviceGroupSurfacePresentModesKHR;
+ vkGetPhysicalDevicePresentRectanglesKHR;
+ vkAcquireNextImage2KHR;
vkCreateDescriptorUpdateTemplate;
vkDestroyDescriptorUpdateTemplate;
vkUpdateDescriptorSetWithTemplate;
- vkGetPhysicalDeviceExternalBufferProperties;
- vkGetPhysicalDeviceExternalFenceProperties;
- vkGetPhysicalDeviceExternalSemaphoreProperties;
- vkGetDescriptorSetLayoutSupport;
- # VK_KHR_bind_memory2;
- vkBindBufferMemory2KHR;
- vkBindImageMemory2KHR;
- # VK_KHR_descriptor_update_template;
- vkCreateDescriptorUpdateTemplateKHR;
- vkDestroyDescriptorUpdateTemplateKHR;
- vkUpdateDescriptorSetWithTemplateKHR;
- # VK_KHR_device_group;
- vkGetDeviceGroupPeerMemoryFeaturesKHR;
- vkCmdSetDeviceMaskKHR;
- vkCmdDispatchBaseKHR;
- # VK_KHR_device_group_creation;
- vkEnumeratePhysicalDeviceGroupsKHR;
- # VK_KHR_external_fence_capabilities;
- vkGetPhysicalDeviceExternalFencePropertiesKHR;
- # VK_KHR_external_memory_capabilities;
- vkGetPhysicalDeviceExternalBufferPropertiesKHR;
- # VK_KHR_external_semaphore_capabilities;
- vkGetPhysicalDeviceExternalSemaphorePropertiesKHR;
- # VK_KHR_get_memory_requirements2;
- vkGetImageMemoryRequirements2KHR;
- vkGetBufferMemoryRequirements2KHR;
- vkGetImageSparseMemoryRequirements2KHR;
- # VK_KHR_get_physical_device_properties2;
- vkGetPhysicalDeviceFeatures2KHR;
- vkGetPhysicalDeviceProperties2KHR;
- vkGetPhysicalDeviceFormatProperties2KHR;
- vkGetPhysicalDeviceImageFormatProperties2KHR;
- vkGetPhysicalDeviceQueueFamilyProperties2KHR;
- vkGetPhysicalDeviceMemoryProperties2KHR;
- vkGetPhysicalDeviceSparseImageFormatProperties2KHR;
- # VK_EXT_debug_utils;
- vkCmdBeginDebugUtilsLabelEXT;
- vkCmdEndDebugUtilsLabelEXT;
- vkCmdInsertDebugUtilsLabelEXT;
- vkCreateDebugUtilsMessengerEXT;
- vkDestroyDebugUtilsMessengerEXT;
- vkQueueBeginDebugUtilsLabelEXT;
- vkQueueEndDebugUtilsLabelEXT;
- vkQueueInsertDebugUtilsLabelEXT;
- vkSetDebugUtilsObjectNameEXT;
- vkSetDebugUtilsObjectTagEXT;
- vkSubmitDebugUtilsMessageEXT;
- # VK_KHR_maintenance1;
- vkTrimCommandPoolKHR;
- # VK_KHR_maintenance3;
- vkGetDescriptorSetLayoutSupportKHR;
- # VK_KHR_sampler_ycbcr_conversion;
- vkCreateSamplerYcbcrConversionKHR;
- vkDestroySamplerYcbcrConversionKHR;
- # VK_KHR_surface;
- vkDestroySurfaceKHR;
- vkGetPhysicalDeviceSurfaceSupportKHR;
- vkGetPhysicalDeviceSurfaceCapabilitiesKHR;
- vkGetPhysicalDeviceSurfaceFormatsKHR;
- vkGetPhysicalDeviceSurfacePresentModesKHR;
- # VK_EXT_host_query_reset
- vkResetQueryPool;
- # VK_EXT_headless_surface
- vkCreateHeadlessSurfaceEXT;
- # VK_KHR_timeline_semaphore
+
+ # VK_KHR_get_display_properties2
+ #vkGetPhysicalDeviceDisplayProperties2KHR;
+ #vkGetPhysicalDeviceDisplayPlaneProperties2KHR;
+ #vkGetDisplayModeProperties2KHR;
+ #vkGetDisplayPlaneCapabilities2KHR;
+
+ # Vulkan 1.2 API entry functions
+ vkGetImageSparseMemoryRequirements2;
+ vkGetPhysicalDeviceImageFormatProperties2;
+
+ vkCreateRenderPass2;
+ vkCmdBeginRenderPass2;
+ vkCmdNextSubpass2;
+ vkCmdEndRenderPass2;
+ vkCmdDrawIndirectCount;
+ vkCmdDrawIndexedIndirectCount;
vkGetSemaphoreCounterValue;
- vkSignalSemaphore;
vkWaitSemaphores;
- vkGetSemaphoreCounterValueKHR;
- vkSignalSemaphoreKHR;
- vkWaitSemaphoresKHR;
- # VK_KHR_buffer_device_address
+ vkSignalSemaphore;
vkGetBufferDeviceAddress;
vkGetBufferOpaqueCaptureAddress;
vkGetDeviceMemoryOpaqueCaptureAddress;
- # VK_KHR_draw_indirect_count
- vkCmdDrawIndirectCount;
- vkCmdDrawIndexedIndirectCount;
- # Android HAL module info object
- HMI;
+ vkResetQueryPool;
local:
*;
};
-
