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
diff --git a/layers/object_tracker.h b/layers/object_tracker.h
index 4bba698..67361ed 100644
--- a/layers/object_tracker.h
+++ b/layers/object_tracker.h
@@ -153,6 +153,7 @@
(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 @@
(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 @@
return result;
}
+#ifndef __ANDROID__
VkResult explicit_GetPhysicalDeviceDisplayPropertiesKHR(VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayPropertiesKHR* pProperties)
{
bool skipCall = false;
@@ -1078,6 +1081,7 @@
}
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,