encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-06-06 22:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix link in standalone on Linux

Browse Source 
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 <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
This commit is contained in:
Corentin Wallez 2019-11-21 18:54:42 +00:00 committed by Commit Bot service account
parent 12e780d709
commit 3f195e7d42
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/include/dawn_native/VulkanBackend.h
View File

@ -33,7 +33,7 @@ namespace dawn_native { namespace vulkan {
}; };
// Common properties of external images // Common properties of external images
struct ExternalImageDescriptor { struct DAWN_NATIVE_EXPORT ExternalImageDescriptor {
public: public:
const ExternalImageDescriptorType type; // Must match the subclass const ExternalImageDescriptorType type; // Must match the subclass
const WGPUTextureDescriptor* cTextureDescriptor; // Must match image creation params 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 // Can't use DAWN_PLATFORM_LINUX since header included in both dawn and chrome
#ifdef __linux__ #ifdef __linux__
// Common properties of external images represented by FDs // Common properties of external images represented by FDs
struct ExternalImageDescriptorFD : ExternalImageDescriptor { struct DAWN_NATIVE_EXPORT ExternalImageDescriptorFD : ExternalImageDescriptor {
public: public:
int memoryFD; // A file descriptor from an export of the memory of the image int memoryFD; // A file descriptor from an export of the memory of the image
std::vector<int> waitFDs; // File descriptors of semaphores which will be waited on std::vector<int> 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 // Descriptor for opaque file descriptor image import
struct ExternalImageDescriptorOpaqueFD : ExternalImageDescriptorFD { struct DAWN_NATIVE_EXPORT ExternalImageDescriptorOpaqueFD : ExternalImageDescriptorFD {
ExternalImageDescriptorOpaqueFD(); ExternalImageDescriptorOpaqueFD();
VkDeviceSize allocationSize; // Must match VkMemoryAllocateInfo from image creation 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 // Descriptor for dma-buf file descriptor image import
struct ExternalImageDescriptorDmaBuf : ExternalImageDescriptorFD { struct DAWN_NATIVE_EXPORT ExternalImageDescriptorDmaBuf : ExternalImageDescriptorFD {
ExternalImageDescriptorDmaBuf(); ExternalImageDescriptorDmaBuf();
uint32_t stride; // Stride of the buffer in bytes uint32_t stride; // Stride of the buffer in bytes