Add VK_NN_vi_surface to WSI extension names array

diff --git a/loader/generated/vk_loader_extensions.c b/loader/generated/vk_loader_extensions.c
index 4fceb51b8597e43240679a2b36aed656b4b7a66f..61a28ec3372f0cd2f2ac320e4e014d41cf847c6a 100644 (file)
--- a/loader/generated/vk_loader_extensions.c
+++ b/loader/generated/vk_loader_extensions.c
@@ -4113,42 +4113,6 @@ VKAPI_ATTR VkResult VKAPI_CALL GetMemoryWin32HandleNV(
 
 #endif // VK_USE_PLATFORM_WIN32_KHR
 
-// ---- VK_NN_vi_surface extension trampoline/terminators
-
-#ifdef VK_USE_PLATFORM_VI_NN
-VKAPI_ATTR VkResult VKAPI_CALL CreateViSurfaceNN(
-    VkInstance                                  instance,
-    const VkViSurfaceCreateInfoNN*              pCreateInfo,
-    const VkAllocationCallbacks*                pAllocator,
-    VkSurfaceKHR*                               pSurface) {
-    struct loader_instance *inst = loader_get_instance(instance);
-    if (NULL == inst) {
-        loader_log(
-            NULL, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
-            "vkCreateViSurfaceNN: Invalid instance [VUID-vkCreateViSurfaceNN-instance-parameter]");
-        abort(); /* Intentionally fail so user can correct issue. */
-    }
-#error("Not implemented. Likely needs to be manually generated!");
-    return inst->disp->CreateViSurfaceNN(instance, pCreateInfo, pAllocator, pSurface);
-}
-
-VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateViSurfaceNN(
-    VkInstance                                  instance,
-    const VkViSurfaceCreateInfoNN*              pCreateInfo,
-    const VkAllocationCallbacks*                pAllocator,
-    VkSurfaceKHR*                               pSurface) {
-    struct loader_instance *inst = loader_get_instance(instance);
-    if (NULL == inst) {
-        loader_log(
-            NULL, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
-            "vkCreateViSurfaceNN: Invalid instance [VUID-vkCreateViSurfaceNN-instance-parameter]");
-        abort(); /* Intentionally fail so user can correct issue. */
-    }
-#error("Not implemented. Likely needs to be manually generated!");
-}
-
-#endif // VK_USE_PLATFORM_VI_NN
-
 // ---- VK_EXT_conditional_rendering extension trampoline/terminators
 
 VKAPI_ATTR void VKAPI_CALL CmdBeginConditionalRenderingEXT(
@@ -7317,16 +7281,6 @@ bool extension_instance_gpa(struct loader_instance *ptr_instance, const char *na
     }
 #endif // VK_USE_PLATFORM_WIN32_KHR
 
-    // ---- VK_NN_vi_surface extension commands
-#ifdef VK_USE_PLATFORM_VI_NN
-    if (!strcmp("vkCreateViSurfaceNN", name)) {
-        *addr = (ptr_instance->enabled_known_extensions.nn_vi_surface == 1)
-                     ? (void *)CreateViSurfaceNN
-                     : NULL;
-        return true;
-    }
-#endif // VK_USE_PLATFORM_VI_NN
-
     // ---- VK_EXT_conditional_rendering extension commands
     if (!strcmp("vkCmdBeginConditionalRenderingEXT", name)) {
         *addr = (void *)CmdBeginConditionalRenderingEXT;
@@ -8123,12 +8077,6 @@ void extensions_create_instance(struct loader_instance *ptr_instance, const VkIn
         } else if (0 == strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_NV_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME)) {
             ptr_instance->enabled_known_extensions.nv_external_memory_capabilities = 1;
 
-    // ---- VK_NN_vi_surface extension commands
-#ifdef VK_USE_PLATFORM_VI_NN
-        } else if (0 == strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_NN_VI_SURFACE_EXTENSION_NAME)) {
-            ptr_instance->enabled_known_extensions.nn_vi_surface = 1;
-#endif // VK_USE_PLATFORM_VI_NN
-
     // ---- VK_EXT_direct_mode_display extension commands
         } else if (0 == strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_DIRECT_MODE_DISPLAY_EXTENSION_NAME)) {
             ptr_instance->enabled_known_extensions.ext_direct_mode_display = 1;

diff --git a/loader/generated/vk_loader_extensions.h b/loader/generated/vk_loader_extensions.h
index 8d06598913e1bd263375cada40ab8acee7e3854f..87f165dee9c230939fdacd117c95b1e392ea2c84 100644 (file)
--- a/loader/generated/vk_loader_extensions.h
+++ b/loader/generated/vk_loader_extensions.h
@@ -482,7 +482,6 @@ union loader_instance_extension_enables {
         uint8_t khr_external_fence_capabilities : 1;
         uint8_t ext_debug_report : 1;
         uint8_t nv_external_memory_capabilities : 1;
-        uint8_t nn_vi_surface : 1;
         uint8_t ext_direct_mode_display : 1;
         uint8_t ext_acquire_xlib_display : 1;
         uint8_t ext_display_surface_counter : 1;

diff --git a/scripts/loader_extension_generator.py b/scripts/loader_extension_generator.py
index fe11e0d824f98cd35affae72e7937316d88abec1..4c0218ebdc2e525a48f17fb41df070994a8902f3 100644 (file)
--- a/scripts/loader_extension_generator.py
+++ b/scripts/loader_extension_generator.py
@@ -45,7 +45,8 @@ WSI_EXT_NAMES = ['VK_KHR_surface',
                  'VK_KHR_display_swapchain',
                  'VK_KHR_get_display_properties2',
                  'VK_KHR_get_surface_capabilities2',
-                 'VK_QNX_screen_surface']
+                 'VK_QNX_screen_surface',
+                 'VK_NN_vi_surface']
 
 ADD_INST_CMDS = ['vkCreateInstance',
                  'vkEnumerateInstanceExtensionProperties',