commit bd846450f48c122ac7cf8c96ead4af5cfca1c8b1
author Jon Ashburn <jon@lunarg.com> Thu Jun 30 10:21:55 2016 -0600
committer Jon Ashburn <jon@lunarg.com> Thu Jun 30 11:18:44 2016 -0600
tree 5843323ad600f4c15c0e2b1d3891edb9d21e60e4
parent e699f44ba5fe702a167e173579772fdea8940800

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

layers/object_tracker.h

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,

layers/unique_objects.h

diff --git a/layers/unique_objects.h b/layers/unique_objects.h
index bd42342..398150a 100644
--- a/layers/unique_objects.h
+++ b/layers/unique_objects.h
@@ -89,6 +89,7 @@
         (PFN_vkGetPhysicalDeviceSurfacePresentModesKHR)gpa(instance, "vkGetPhysicalDeviceSurfacePresentModesKHR");
 
     // KHR_display
+#ifndef __ANDROID__
     pDisp->GetPhysicalDeviceDisplayPropertiesKHR = (PFN_vkGetPhysicalDeviceDisplayPropertiesKHR)gpa(instance, "vkGetPhysicalDeviceDisplayPropertiesKHR");
     pDisp->GetPhysicalDeviceDisplayPlanePropertiesKHR = (PFN_vkGetPhysicalDeviceDisplayPlanePropertiesKHR)gpa(instance, "vkGetPhysicalDeviceDisplayPlanePropertiesKHR");
     pDisp->GetDisplayPlaneSupportedDisplaysKHR = (PFN_vkGetDisplayPlaneSupportedDisplaysKHR)gpa(instance, "vkGetDisplayPlaneSupportedDisplaysKHR");
@@ -96,6 +97,7 @@
     pDisp->CreateDisplayModeKHR = (PFN_vkCreateDisplayModeKHR)gpa(instance, "vkCreateDisplayModeKHR");
     pDisp->GetDisplayPlaneCapabilitiesKHR = (PFN_vkGetDisplayPlaneCapabilitiesKHR)gpa(instance, "vkGetDisplayPlaneCapabilitiesKHR");
     pDisp->CreateDisplayPlaneSurfaceKHR = (PFN_vkCreateDisplayPlaneSurfaceKHR)gpa(instance, "vkCreateDisplayPlaneSurfaceKHR");
+#endif
 
 #ifdef VK_USE_PLATFORM_WIN32_KHR
     pDisp->CreateWin32SurfaceKHR = (PFN_vkCreateWin32SurfaceKHR)gpa(instance, "vkCreateWin32SurfaceKHR");
@@ -418,6 +420,7 @@
     return result;
 }
 
+ #ifndef __ANDROID__
 VkResult explicit_GetPhysicalDeviceDisplayPropertiesKHR(VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayPropertiesKHR* pProperties)
 {
     layer_data *my_map_data = get_my_data_ptr(get_dispatch_key(physicalDevice), layer_data_map);
@@ -465,9 +468,9 @@
         if ((*pDisplayCount > 0) && pDisplays) {
             std::lock_guard<std::mutex> lock(global_lock);
             for (uint32_t i = 0; i < *pDisplayCount; i++) {
-                auto it = my_map_data->unique_id_mapping.find(reinterpret_cast<uint64_t> (pDisplays[i]));
+		    auto it = my_map_data->unique_id_mapping.find(reinterpret_cast<const uint64_t &> (pDisplays[i]));
                 assert (it !=  my_map_data->unique_id_mapping.end());
-                pDisplays[i] = reinterpret_cast<VkDisplayKHR> (it->second);
+                pDisplays[i] = reinterpret_cast<VkDisplayKHR&> (it->second);
             }
         }
     }
@@ -508,4 +511,5 @@
         delete[] local_pProperties;
     return result;
 }
+#endif
 } // namespace unique_objects