From 3f195e7d421e3fe5fa64136b099e79fc591f59b6 Mon Sep 17 00:00:00 2001 From: Corentin Wallez Date: Thu, 21 Nov 2019 18:54:42 +0000 Subject: [PATCH] Fix link in standalone on Linux There were some missing DAWN_NATIVE_EXPORT arributes for new structures in VulkanBackend.h which resulted in linking errors. BUG=chromium:996470 Change-Id: I45deb56faf5fd77ecfa96ebda99d31d0109d98ec Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/13900 Commit-Queue: Corentin Wallez Reviewed-by: Austin Eng --- src/include/dawn_native/VulkanBackend.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/include/dawn_native/VulkanBackend.h b/src/include/dawn_native/VulkanBackend.h index 46dbdb9a0c..83ff65f135 100644 --- a/src/include/dawn_native/VulkanBackend.h +++ b/src/include/dawn_native/VulkanBackend.h @@ -33,7 +33,7 @@ namespace dawn_native { namespace vulkan { }; // Common properties of external images - struct ExternalImageDescriptor { + struct DAWN_NATIVE_EXPORT ExternalImageDescriptor { public: const ExternalImageDescriptorType type; // Must match the subclass const WGPUTextureDescriptor* cTextureDescriptor; // Must match image creation params @@ -55,7 +55,7 @@ namespace dawn_native { namespace vulkan { // Can't use DAWN_PLATFORM_LINUX since header included in both dawn and chrome #ifdef __linux__ // Common properties of external images represented by FDs - struct ExternalImageDescriptorFD : ExternalImageDescriptor { + struct DAWN_NATIVE_EXPORT ExternalImageDescriptorFD : ExternalImageDescriptor { public: int memoryFD; // A file descriptor from an export of the memory of the image std::vector waitFDs; // File descriptors of semaphores which will be waited on @@ -65,7 +65,7 @@ namespace dawn_native { namespace vulkan { }; // Descriptor for opaque file descriptor image import - struct ExternalImageDescriptorOpaqueFD : ExternalImageDescriptorFD { + struct DAWN_NATIVE_EXPORT ExternalImageDescriptorOpaqueFD : ExternalImageDescriptorFD { ExternalImageDescriptorOpaqueFD(); VkDeviceSize allocationSize; // Must match VkMemoryAllocateInfo from image creation @@ -73,7 +73,7 @@ namespace dawn_native { namespace vulkan { }; // Descriptor for dma-buf file descriptor image import - struct ExternalImageDescriptorDmaBuf : ExternalImageDescriptorFD { + struct DAWN_NATIVE_EXPORT ExternalImageDescriptorDmaBuf : ExternalImageDescriptorFD { ExternalImageDescriptorDmaBuf(); uint32_t stride; // Stride of the buffer in bytes