From 935e5e68fa4d25ba4686a80aea20c01c246af8e3 Mon Sep 17 00:00:00 2001
From: David Neto <dneto@google.com>
Date: Fri, 22 Oct 2021 04:03:31 -0400
Subject: [PATCH] Don't overwrite vkGetInstanceProcAddress

The vk::DispatchLoaderDynamic::init(vk::VkInstance) method should note
use vkGetInstanceProcAddr to overwrite vkGetInstanceProcAddr itself.

vkGetInstanceProcAddr( a_valid_instance, "vkGetInstanceProcAddr" ) is
required to return NULL.

Fixes: 1108
---
 VulkanHppGenerator.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
index 89fc032..1ca0256 100644
--- a/VulkanHppGenerator.cpp
+++ b/VulkanHppGenerator.cpp
@@ -6066,6 +6066,11 @@ std::string VulkanHppGenerator::generateDispatchLoaderDynamicCommandAssignment(
                                                                                 CommandData const & commandData,
                                                                                 std::string const & firstArg ) const
 {
+  if (commandName == "vkGetInstanceProcAddr")
+  {
+    // Don't overwite vkGetInstanceProcAddr with NULL.
+    return "";
+  }
   std::string str = "      " + commandName + " = PFN_" + commandName + "( vkGet" +
                     ( ( firstArg == "device" ) ? "Device" : "Instance" ) + "ProcAddr( " + firstArg + ", \"" +
                     commandName + "\" ) );\n";