loader: Cleanup 1.0.25 extension work
Remove adding extensions from being exported from loader by
default. Add in logic to only export entry points if extensions
are enabled.
Change-Id: I56e0c673925869e0d4482ee401ea19e43a05267f
diff --git a/vulkan.py b/vulkan.py
index 7551be4..6d85080 100644
--- a/vulkan.py
+++ b/vulkan.py
@@ -1372,9 +1372,7 @@
if sys.argv[1] == 'AllPlatforms':
extensions = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_win32_surface, ext_khr_xcb_surface,
ext_khr_xlib_surface, ext_khr_wayland_surface, ext_khr_mir_surface, ext_khr_display,
- ext_khr_android_surface, ext_amd_extension_draw_indirect_count,
- ext_nv_external_memory_capabilities, ext_nv_external_memory_win32,
- ext_khr_display_swapchain]
+ ext_khr_android_surface, ext_khr_display_swapchain]
extensions_all = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_win32_surface,
ext_khr_xcb_surface, ext_khr_xlib_surface, ext_khr_wayland_surface, ext_khr_mir_surface,
ext_khr_display, ext_khr_android_surface, ext_amd_extension_draw_indirect_count,
@@ -1384,9 +1382,7 @@
if len(sys.argv) > 3:
if (sys.platform.startswith('win32') or sys.platform.startswith('msys')) and sys.argv[1] != 'Android':
extensions = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_win32_surface,
- ext_khr_display, ext_amd_extension_draw_indirect_count,
- ext_nv_external_memory_capabilities, ext_nv_external_memory_win32,
- ext_khr_display_swapchain]
+ ext_khr_display, ext_khr_display_swapchain]
extensions_all = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_win32_surface,
ext_khr_display, ext_amd_extension_draw_indirect_count,
ext_nv_external_memory_capabilities, ext_nv_external_memory_win32,
@@ -1394,7 +1390,6 @@
elif sys.platform.startswith('linux') and sys.argv[1] != 'Android':
extensions = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_xcb_surface,
ext_khr_xlib_surface, ext_khr_wayland_surface, ext_khr_mir_surface, ext_khr_display,
- ext_amd_extension_draw_indirect_count, ext_nv_external_memory_capabilities,
ext_khr_display_swapchain]
extensions_all = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_xcb_surface,
ext_khr_xlib_surface, ext_khr_wayland_surface, ext_khr_mir_surface,
@@ -1403,7 +1398,6 @@
ext_debug_report, ext_debug_marker]
else: # android
extensions = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_android_surface,
- ext_amd_extension_draw_indirect_count, ext_nv_external_memory_capabilities,
ext_khr_display_swapchain]
extensions_all = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_android_surface,
ext_amd_extension_draw_indirect_count, ext_nv_external_memory_capabilities,
@@ -1411,16 +1405,13 @@
else :
if sys.argv[1] == 'Win32' or sys.argv[1] == 'msys':
extensions = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_win32_surface,
- ext_khr_display, ext_amd_extension_draw_indirect_count,
- ext_nv_external_memory_capabilities, ext_nv_external_memory_win32,
- ext_khr_display_swapchain]
+ ext_khr_display, ext_khr_display_swapchain]
extensions_all = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_win32_surface,
ext_khr_display, ext_amd_extension_draw_indirect_count,
ext_nv_external_memory_capabilities, ext_nv_external_memory_win32,
ext_khr_display_swapchain, ext_debug_report, ext_debug_marker]
elif sys.argv[1] == 'Android':
extensions = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_android_surface,
- ext_amd_extension_draw_indirect_count, ext_nv_external_memory_capabilities,
ext_khr_display_swapchain]
extensions_all = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_android_surface,
ext_amd_extension_draw_indirect_count, ext_nv_external_memory_capabilities,
@@ -1428,8 +1419,7 @@
elif sys.argv[1] == 'Xcb' or sys.argv[1] == 'Xlib' or sys.argv[1] == 'Wayland' or sys.argv[1] == 'Mir' or sys.argv[1] == 'Display':
extensions = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_xcb_surface,
ext_khr_xlib_surface, ext_khr_wayland_surface, ext_khr_mir_surface,
- ext_khr_display, ext_amd_extension_draw_indirect_count,
- ext_nv_external_memory_capabilities, ext_khr_display_swapchain]
+ ext_khr_display, ext_khr_display_swapchain]
extensions_all = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_xcb_surface,
ext_khr_xlib_surface, ext_khr_wayland_surface, ext_khr_mir_surface,
ext_khr_display, ext_amd_extension_draw_indirect_count,