do not change HookInitPromotedExtension signature

baldurk · Jun 25, 2024 · c5b0e76 · c5b0e76
1 parent 897eda8
commit c5b0e76
Show file tree

Hide file tree

Showing 4 changed files with 113 additions and 115 deletions.
diff --git a/renderdoc/driver/vulkan/vk_dispatchtables.cpp b/renderdoc/driver/vulkan/vk_dispatchtables.cpp
@@ -90,7 +90,7 @@ void InitInstanceExtensionTables(VkInstance instance, InstanceDeviceInfo *info)
   }
 
 #undef HookInitPromotedExtension
-#define HookInitPromotedExtension(cond, version, func, suffix) \
+#define HookInitPromotedExtension(cond, func, suffix) \
   if(cond)                                                     \
   {                                                            \
     InstanceGPA(func);                                         \
@@ -140,7 +140,7 @@ void InitDeviceExtensionTables(VkDevice device, InstanceDeviceInfo *info)
   }
 
 #undef HookInitPromotedExtension
-#define HookInitPromotedExtension(cond, version, func, suffix) \
+#define HookInitPromotedExtension(cond, func, suffix) \
   if(cond)                                                     \
   {                                                            \
     DeviceGPA(func);                                           \

diff --git a/renderdoc/driver/vulkan/vk_dispatchtables.h b/renderdoc/driver/vulkan/vk_dispatchtables.h
@@ -26,6 +26,7 @@
 
 // layer includes
 
+#include <cstdint>
 #if ENABLED(RDOC_WIN32)
 // undefined clashing windows #defines
 #undef CreateEvent
@@ -37,10 +38,19 @@
 
 void InitReplayTables(void *vulkanModule);
 
+// bitmask of extension enabled status
+enum ExtensionStatusFlagBits {
+  NotEnabled = 0,
+  ExplicitEnabled = 1 << 0,
+  PromotionEnabled = 1 << 1,
+};
+
+typedef uint8_t ExtensionStatusFlags;
+
 struct InstanceDeviceInfo
 {
 #undef DeclExt
-#define DeclExt(name) bool ext_##name = false;
+#define DeclExt(name) ExtensionStatusFlags ext_##name = ExtensionStatusFlagBits::NotEnabled;
 
   bool brokenGetDeviceProcAddr = false;