Commit ebbca824 authored by Michael Spang's avatar Michael Spang Committed by Commit Bot

ozone: drm: Inline vulkan_intel.h to fix build error

Including <vulkan/vulkan_intel.h> results in compilation errors when building
with the CrOS SDK, because we use vulkan.h from //third_party/vulkan.

This is a temporary issue since we're using a deprecated extension for
dmabuf import. Fix it by inlining the header.

Bug: 866564
Test: Compile chrome with cros chrome-sdk --board=eve
Change-Id: If84ae6b503e7b0af67df72d7092d9467549eaed8
Reviewed-on: https://chromium-review.googlesource.com/1147219Reviewed-by: default avatarDaniel Nicoara <dnicoara@chromium.org>
Commit-Queue: Michael Spang <spang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577241}
parent 47a44d77
...@@ -32,7 +32,22 @@ ...@@ -32,7 +32,22 @@
#include "gpu/vulkan/vulkan_function_pointers.h" #include "gpu/vulkan/vulkan_function_pointers.h"
#include "ui/ozone/platform/drm/gpu/vulkan_implementation_gbm.h" #include "ui/ozone/platform/drm/gpu/vulkan_implementation_gbm.h"
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
#include <vulkan/vulkan_intel.h> #define VK_STRUCTURE_TYPE_DMA_BUF_IMAGE_CREATE_INFO_INTEL 1024
typedef struct VkDmaBufImageCreateInfo_ {
VkStructureType sType;
const void* pNext;
int fd;
VkFormat format;
VkExtent3D extent;
uint32_t strideInBytes;
} VkDmaBufImageCreateInfo;
typedef VkResult(VKAPI_PTR* PFN_vkCreateDmaBufImageINTEL)(
VkDevice device,
const VkDmaBufImageCreateInfo* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
VkDeviceMemory* pMem,
VkImage* pImage);
#endif #endif
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment