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

vk-layer-generate.py

diff --git a/vk-layer-generate.py b/vk-layer-generate.py
index 977fd13..3ead8c0 100755
--- a/vk-layer-generate.py
+++ b/vk-layer-generate.py
@@ -1391,6 +1391,13 @@
                 'vkGetDisplayPlaneCapabilitiesKHR',
                 'vkCreateDisplayPlaneSurfaceKHR',
                 ]
+        additional_android_instance_extensions = [
+                'vkDestroySurfaceKHR',
+                'vkGetPhysicalDeviceSurfaceSupportKHR',
+                'vkGetPhysicalDeviceSurfaceCapabilitiesKHR',
+                'vkGetPhysicalDeviceSurfaceFormatsKHR',
+                'vkGetPhysicalDeviceSurfacePresentModesKHR',
+                ]
         if self.wsi == 'Win32':
             instance_extensions=[('msg_callback_get_proc_addr', []),
                                   ('wsi_enabled',
@@ -1399,7 +1406,7 @@
         elif self.wsi == 'Android':
             instance_extensions=[('msg_callback_get_proc_addr', []),
                                   ('wsi_enabled',
-                                  ['vkCreateAndroidSurfaceKHR'] + additional_instance_extensions)]
+                                  ['vkCreateAndroidSurfaceKHR'] + additional_android_instance_extensions)]
         elif self.wsi == 'Xcb' or self.wsi == 'Xlib' or self.wsi == 'Wayland' or self.wsi == 'Mir':
             instance_extensions=[('msg_callback_get_proc_addr', []),
                                   ('wsi_enabled',
@@ -1723,7 +1730,6 @@
                                  ('win32_enabled', ['vkCreateWin32SurfaceKHR'])]
         elif self.wsi == 'Android':
             instance_extensions=[('wsi_enabled', surface_wsi_instance_exts),
-                                 ('display_enabled', display_wsi_instance_exts),
                                  ('android_enabled', ['vkCreateAndroidSurfaceKHR'])]
         elif self.wsi == 'Xcb' or self.wsi == 'Xlib' or self.wsi == 'Wayland' or self.wsi == 'Mir':
             instance_extensions=[('wsi_enabled', surface_wsi_instance_exts),