From cf508427da9f761ee6030f47585a8955dff68a9c Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Sat, 12 May 2018 12:58:25 +0100
Subject: [PATCH] Remove assert that aliased functions will return same pointer

* The validation layers break this, although that's a very worrying
  trend if KHR and core-promoted functions are allowed to be different
  and potentially have different implementations.
---
 renderdoc/driver/vulkan/vk_dispatchtables.cpp | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/renderdoc/driver/vulkan/vk_dispatchtables.cpp b/renderdoc/driver/vulkan/vk_dispatchtables.cpp
index 25b9c4ffa..9bcf177d8 100644
--- a/renderdoc/driver/vulkan/vk_dispatchtables.cpp
+++ b/renderdoc/driver/vulkan/vk_dispatchtables.cpp
@@ -133,18 +133,15 @@ void InitDeviceExtensionTables(VkDevice device, InstanceDeviceInfo *info)
   }
 
 #undef HookInitPromotedExtension
-#define HookInitPromotedExtension(cond, func, suffix)                              \
-  if(cond)                                                                         \
-  {                                                                                \
-    DeviceGPA(func);                                                               \
-    DeviceGPA(CONCAT(func, suffix));                                               \
-    RDCASSERT(table->func == table->CONCAT(func, suffix) || table->func == NULL || \
-                  table->CONCAT(func, suffix) == NULL,                             \
-              (void *)table->func, (void *)table->CONCAT(func, suffix));           \
-    if(table->func == NULL)                                                        \
-      table->func = table->CONCAT(func, suffix);                                   \
-    if(table->CONCAT(func, suffix) == NULL)                                        \
-      table->CONCAT(func, suffix) = table->func;                                   \
+#define HookInitPromotedExtension(cond, func, suffix) \
+  if(cond)                                            \
+  {                                                   \
+    DeviceGPA(func);                                  \
+    DeviceGPA(CONCAT(func, suffix));                  \
+    if(table->func == NULL)                           \
+      table->func = table->CONCAT(func, suffix);      \
+    if(table->CONCAT(func, suffix) == NULL)           \
+      table->CONCAT(func, suffix) = table->func;      \
   }
 
   CheckInstanceExts();