From 526006a02afae51c4d27be8342f3b5b4bf91a4a9 Mon Sep 17 00:00:00 2001 From: Michel Zou Date: Wed, 21 Oct 2020 22:34:00 +0200 Subject: [PATCH] Use declspec macro instead of def file --- loader/CMakeLists.txt | 1 - loader/loader.h | 4 +- loader/vulkan-1.def | 237 ------------------------------------------ 3 files changed, 3 insertions(+), 239 deletions(-) delete mode 100644 loader/vulkan-1.def diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index 7341403e7..b9f552f4f 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -215,7 +215,6 @@ if(WIN32) $ $ $ - ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-1.def ${CMAKE_CURRENT_SOURCE_DIR}/loader.rc) set_target_properties(vulkan PROPERTIES LINK_FLAGS_DEBUG diff --git a/loader/loader.h b/loader/loader.h index 621eb0be3..67397207d 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -38,7 +38,9 @@ #include "vk_layer_dispatch_table.h" #include "vk_loader_extensions.h" -#if defined(__GNUC__) && __GNUC__ >= 4 +#if defined(_WIN32) +#define LOADER_EXPORT __declspec(dllexport) +#elif defined(__GNUC__) && __GNUC__ >= 4 #define LOADER_EXPORT __attribute__((visibility("default"))) #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) #define LOADER_EXPORT __attribute__((visibility("default"))) diff --git a/loader/vulkan-1.def b/loader/vulkan-1.def deleted file mode 100644 index 385f85103..000000000 --- a/loader/vulkan-1.def +++ /dev/null @@ -1,237 +0,0 @@ - -;;;; Begin Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; -; Copyright (c) 2015-2017, 2019 The Khronos Group Inc. -; Copyright (c) 2015-2017, 2019 Valve Corporation -; Copyright (c) 2015-2017, 2019 LunarG, Inc. -; -; Licensed under the Apache License, Version 2.0 (the "License"); -; you may not use this file except in compliance with the License. -; You may obtain a copy of the License at -; -; http://www.apache.org/licenses/LICENSE-2.0 -; -; Unless required by applicable law or agreed to in writing, software -; distributed under the License is distributed on an "AS IS" BASIS, -; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -; See the License for the specific language governing permissions and -; limitations under the License. -; -; Author: Courtney Goeltzenleuchter -; -;;;; End Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -LIBRARY vulkan-1.dll -EXPORTS - vkCreateInstance - vkDestroyInstance - vkEnumeratePhysicalDevices - vkGetPhysicalDeviceFeatures - vkGetPhysicalDeviceFormatProperties - vkGetPhysicalDeviceImageFormatProperties - vkGetPhysicalDeviceProperties - vkGetPhysicalDeviceQueueFamilyProperties - vkGetPhysicalDeviceMemoryProperties - vkGetInstanceProcAddr - vkGetDeviceProcAddr - vkCreateDevice - vkDestroyDevice - vkEnumerateInstanceExtensionProperties - vkEnumerateDeviceExtensionProperties - vkEnumerateInstanceLayerProperties - vkEnumerateDeviceLayerProperties - vkGetDeviceQueue - vkQueueSubmit - vkQueueWaitIdle - vkDeviceWaitIdle - vkAllocateMemory - vkFreeMemory - vkMapMemory - vkUnmapMemory - vkFlushMappedMemoryRanges - vkInvalidateMappedMemoryRanges - vkGetDeviceMemoryCommitment - vkBindBufferMemory - vkBindImageMemory - vkGetBufferMemoryRequirements - vkGetImageMemoryRequirements - vkGetImageSparseMemoryRequirements - vkGetPhysicalDeviceSparseImageFormatProperties - vkQueueBindSparse - vkCreateFence - vkDestroyFence - vkResetFences - vkGetFenceStatus - vkWaitForFences - vkCreateSemaphore - vkDestroySemaphore - vkCreateEvent - vkDestroyEvent - vkGetEventStatus - vkSetEvent - vkResetEvent - vkCreateQueryPool - vkDestroyQueryPool - vkGetQueryPoolResults - vkCreateBuffer - vkDestroyBuffer - vkCreateBufferView - vkDestroyBufferView - vkCreateImage - vkDestroyImage - vkGetImageSubresourceLayout - vkCreateImageView - vkDestroyImageView - vkCreateShaderModule - vkDestroyShaderModule - vkCreatePipelineCache - vkDestroyPipelineCache - vkGetPipelineCacheData - vkMergePipelineCaches - vkCreateGraphicsPipelines - vkCreateComputePipelines - vkDestroyPipeline - vkCreatePipelineLayout - vkDestroyPipelineLayout - vkCreateSampler - vkDestroySampler - vkCreateDescriptorSetLayout - vkDestroyDescriptorSetLayout - vkCreateDescriptorPool - vkDestroyDescriptorPool - vkResetDescriptorPool - vkAllocateDescriptorSets - vkFreeDescriptorSets - vkUpdateDescriptorSets - vkCreateFramebuffer - vkDestroyFramebuffer - vkCreateRenderPass - vkDestroyRenderPass - vkGetRenderAreaGranularity - vkCreateCommandPool - vkDestroyCommandPool - vkResetCommandPool - vkAllocateCommandBuffers - vkFreeCommandBuffers - vkBeginCommandBuffer - vkEndCommandBuffer - vkResetCommandBuffer - vkCmdBindPipeline - vkCmdSetViewport - vkCmdSetScissor - vkCmdSetLineWidth - vkCmdSetDepthBias - vkCmdSetBlendConstants - vkCmdSetDepthBounds - vkCmdSetStencilCompareMask - vkCmdSetStencilWriteMask - vkCmdSetStencilReference - vkCmdBindDescriptorSets - vkCmdBindIndexBuffer - vkCmdBindVertexBuffers - vkCmdDraw - vkCmdDrawIndexed - vkCmdDrawIndirect - vkCmdDrawIndexedIndirect - vkCmdDispatch - vkCmdDispatchIndirect - vkCmdCopyBuffer - vkCmdCopyImage - vkCmdBlitImage - vkCmdCopyBufferToImage - vkCmdCopyImageToBuffer - vkCmdUpdateBuffer - vkCmdFillBuffer - vkCmdClearColorImage - vkCmdClearDepthStencilImage - vkCmdClearAttachments - vkCmdResolveImage - vkCmdSetEvent - vkCmdResetEvent - vkCmdWaitEvents - vkCmdPipelineBarrier - vkCmdBeginQuery - vkCmdEndQuery - vkCmdResetQueryPool - vkCmdWriteTimestamp - vkCmdCopyQueryPoolResults - vkCmdPushConstants - vkCmdBeginRenderPass - vkCmdNextSubpass - vkCmdEndRenderPass - vkCmdExecuteCommands - vkDestroySurfaceKHR - vkGetPhysicalDeviceSurfaceSupportKHR - vkGetPhysicalDeviceSurfaceCapabilitiesKHR - vkGetPhysicalDeviceSurfaceFormatsKHR - vkGetPhysicalDeviceSurfaceCapabilities2KHR - vkGetPhysicalDeviceSurfaceFormats2KHR - vkGetPhysicalDeviceSurfacePresentModesKHR - vkCreateSwapchainKHR - vkDestroySwapchainKHR - vkGetSwapchainImagesKHR - vkAcquireNextImageKHR - vkQueuePresentKHR - vkGetPhysicalDeviceDisplayPropertiesKHR - vkGetPhysicalDeviceDisplayPlanePropertiesKHR - vkGetDisplayPlaneSupportedDisplaysKHR - vkGetDisplayModePropertiesKHR - vkCreateDisplayModeKHR - vkGetDisplayPlaneCapabilitiesKHR - vkCreateDisplayPlaneSurfaceKHR - vkCreateSharedSwapchainsKHR - vkCreateWin32SurfaceKHR - vkGetPhysicalDeviceWin32PresentationSupportKHR - - vkEnumerateInstanceVersion - vkEnumeratePhysicalDeviceGroups - vkGetPhysicalDeviceFeatures2 - vkGetPhysicalDeviceProperties2 - vkGetPhysicalDeviceFormatProperties2 - vkGetPhysicalDeviceQueueFamilyProperties2 - vkGetPhysicalDeviceMemoryProperties2 - vkGetPhysicalDeviceSparseImageFormatProperties2 - vkGetPhysicalDeviceExternalBufferProperties - vkGetPhysicalDeviceExternalSemaphoreProperties - vkGetPhysicalDeviceExternalFenceProperties - vkBindBufferMemory2 - vkBindImageMemory2 - vkGetDeviceGroupPeerMemoryFeatures - vkCmdSetDeviceMask - vkCmdDispatchBase - vkGetImageMemoryRequirements2 - vkGetBufferMemoryRequirements2 - vkTrimCommandPool - vkGetDeviceQueue2 - vkCreateSamplerYcbcrConversion - vkDestroySamplerYcbcrConversion - vkGetDescriptorSetLayoutSupport - vkGetDeviceGroupPresentCapabilitiesKHR - vkGetDeviceGroupSurfacePresentModesKHR - vkGetPhysicalDevicePresentRectanglesKHR - vkAcquireNextImage2KHR - vkCreateDescriptorUpdateTemplate - vkDestroyDescriptorUpdateTemplate - vkUpdateDescriptorSetWithTemplate - - vkGetPhysicalDeviceDisplayProperties2KHR - vkGetPhysicalDeviceDisplayPlaneProperties2KHR - vkGetDisplayModeProperties2KHR - vkGetDisplayPlaneCapabilities2KHR - - vkGetImageSparseMemoryRequirements2 - vkGetPhysicalDeviceImageFormatProperties2 - - vkCreateRenderPass2 - vkCmdBeginRenderPass2 - vkCmdNextSubpass2 - vkCmdEndRenderPass2 - vkCmdDrawIndirectCount - vkCmdDrawIndexedIndirectCount - vkGetSemaphoreCounterValue - vkWaitSemaphores - vkSignalSemaphore - vkGetBufferDeviceAddress - vkGetBufferOpaqueCaptureAddress - vkGetDeviceMemoryOpaqueCaptureAddress - vkResetQueryPool