diff options
| author | Jon Ashburn <jon@lunarg.com> | 2016-06-30 10:21:55 -0600 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2016-06-30 11:18:44 -0600 |
| commit | 00841d30978d944ecffa5723a09312e07de6846f (patch) | |
| tree | c2e3ae2e1d91803aa427e63b5add0e9e31d4779e /layers/object_tracker.h | |
| parent | 9323e68e7766b5b1da61fec1eae72d4bd4895bb7 (diff) | |
| download | usermoji-00841d30978d944ecffa5723a09312e07de6846f.tar.xz | |
layers: Fix compilation errors for KHR_display ext
For Android remove KHR_display entry points from intercept generation and
from header files.
Change-Id: Ic1386a94a2229c45a1ffaac3651326324105351e
Diffstat (limited to 'layers/object_tracker.h')
| -rw-r--r-- | layers/object_tracker.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/layers/object_tracker.h b/layers/object_tracker.h index 4bba6985..67361ed4 100644 --- a/layers/object_tracker.h +++ b/layers/object_tracker.h @@ -153,6 +153,7 @@ static void createInstanceRegisterExtensions(const VkInstanceCreateInfo *pCreate (PFN_vkGetPhysicalDeviceSurfaceFormatsKHR)gpa(instance, "vkGetPhysicalDeviceSurfaceFormatsKHR"); pDisp->GetPhysicalDeviceSurfacePresentModesKHR = (PFN_vkGetPhysicalDeviceSurfacePresentModesKHR)gpa(instance, "vkGetPhysicalDeviceSurfacePresentModesKHR"); +#ifndef __ANDROID__ pDisp->GetPhysicalDeviceDisplayPropertiesKHR = (PFN_vkGetPhysicalDeviceDisplayPropertiesKHR)gpa(instance, "vkGetPhysicalDeviceDisplayPropertiesKHR"); pDisp->GetPhysicalDeviceDisplayPlanePropertiesKHR = @@ -167,6 +168,7 @@ static void createInstanceRegisterExtensions(const VkInstanceCreateInfo *pCreate (PFN_vkGetDisplayPlaneCapabilitiesKHR)gpa(instance, "vkGetDisplayPlaneCapabilitiesKHR"); pDisp->CreateDisplayPlaneSurfaceKHR = (PFN_vkCreateDisplayPlaneSurfaceKHR)gpa(instance, "vkCreateDisplayPlaneSurfaceKHR"); +#endif #if VK_USE_PLATFORM_WIN32_KHR pDisp->CreateWin32SurfaceKHR = (PFN_vkCreateWin32SurfaceKHR)gpa(instance, "vkCreateWin32SurfaceKHR"); @@ -1032,6 +1034,7 @@ VkResult explicit_GetSwapchainImagesKHR(VkDevice device, VkSwapchainKHR swapchai return result; } +#ifndef __ANDROID__ VkResult explicit_GetPhysicalDeviceDisplayPropertiesKHR(VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayPropertiesKHR* pProperties) { bool skipCall = false; @@ -1078,6 +1081,7 @@ VkResult explicit_GetDisplayModePropertiesKHR(VkPhysicalDevice physicalDevice, V } return result; } +#endif // TODO: Add special case to codegen to cover validating all the pipelines instead of just the first VkResult explicit_CreateGraphicsPipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, |