Remove API_NAME

richard-lunarg · Nov 19, 2023 · 19e9e53 · 19e9e53
1 parent 93c1772
commit 19e9e53
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -76,7 +76,6 @@ config("vulkan_loader_config") {
     "loader",
   ]
   defines = [
-    "API_NAME=\"Vulkan\"",
     "LOADER_USE_UNSAFE_FILE_SEARCH=1",
   ]
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -141,7 +141,6 @@ else()
 endif()
 
 add_library(loader_common_options INTERFACE)
-target_compile_definitions(loader_common_options INTERFACE API_NAME="Vulkan")
 target_link_libraries(loader_common_options INTERFACE platform_wsi)
 
 # Enable beta Vulkan extensions

diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h
@@ -180,15 +180,10 @@ typedef pthread_cond_t loader_platform_thread_cond;
 #define VK_ELAYERS_INFO_RELATIVE_DIR ""
 #define VK_ILAYERS_INFO_RELATIVE_DIR ""
 
-#if defined(_WIN64)
-#define HKR_VK_DRIVER_NAME API_NAME "DriverName"
-#else
-#define HKR_VK_DRIVER_NAME API_NAME "DriverNameWow"
-#endif
-#define VK_DRIVERS_INFO_REGISTRY_LOC "SOFTWARE\\Khronos\\" API_NAME "\\Drivers"
-#define VK_ELAYERS_INFO_REGISTRY_LOC "SOFTWARE\\Khronos\\" API_NAME "\\ExplicitLayers"
-#define VK_ILAYERS_INFO_REGISTRY_LOC "SOFTWARE\\Khronos\\" API_NAME "\\ImplicitLayers"
-#define VK_SETTINGS_INFO_REGISTRY_LOC "SOFTWARE\\Khronos\\" API_NAME "\\LoaderSettings"
+#define VK_DRIVERS_INFO_REGISTRY_LOC "SOFTWARE\\Khronos\\Vulkan\\Drivers"
+#define VK_ELAYERS_INFO_REGISTRY_LOC "SOFTWARE\\Khronos\\Vulkan\\ExplicitLayers"
+#define VK_ILAYERS_INFO_REGISTRY_LOC "SOFTWARE\\Khronos\\Vulkan\\ImplicitLayers"
+#define VK_SETTINGS_INFO_REGISTRY_LOC "SOFTWARE\\Khronos\\Vulkan\\LoaderSettings"
 
 #define PRINTF_SIZE_T_SPECIFIER "%Iu"