From 7ddece584fbfde91655486701fbf24afc9082e55 Mon Sep 17 00:00:00 2001 From: Jon Ashburn Date: Tue, 30 Jun 2015 14:46:22 -0700 Subject: loader: Support gettting JSON ICD manifest files from registry Windows now supports the JSON manifest file for ICDs --- loader/loader_platform.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'loader/loader_platform.h') diff --git a/loader/loader_platform.h b/loader/loader_platform.h index b0bd2d51..a7bd0c64 100644 --- a/loader/loader_platform.h +++ b/loader/loader_platform.h @@ -161,6 +161,8 @@ static inline void loader_platform_thread_cond_broadcast(loader_platform_thread_ #include #include #include +#include +#include #ifdef __cplusplus #include #include @@ -170,7 +172,8 @@ using namespace std; // VK Library Filenames, Paths, etc.: #define PATH_SEPERATOR ';' #define DIRECTORY_SYMBOL '\\' -#define DEFAULT_VK_DRIVERS_INFO "HKEY_LOCAL_MACHINE\SOFTWARE\Khronos\Vulkan\Drivers" +#define DEFAULT_VK_REGISTRY_HIVE HKEY_LOCAL_MACHINE +#define DEFAULT_VK_DRIVERS_INFO "SOFTWARE\\Khronos\\Vulkan\\Drivers" // TODO: Are these the correct paths #define DEFAULT_VK_DRIVERS_PATH "C:\\Windows\\System32;C:\\Windows\\SysWow64" // TODO/TBD: Is this an appropriate prefix for Windows? @@ -222,9 +225,9 @@ static char *basename(char *pathname) } // File IO -static inline bool loader_platform_file_exists(const char *path) +static bool loader_platform_file_exists(const char *path) { - if (_access(path, 0)) + if ((_access(path, 0)) == -1) return false; else return true; -- cgit v1.2.3