diff options
| author | Tony Barbour <tony@LunarG.com> | 2015-04-20 16:28:46 -0600 |
|---|---|---|
| committer | Tony Barbour <tony@LunarG.com> | 2015-04-21 09:56:51 -0600 |
| commit | f57e73d2d642b0b21925428ed649a203e8b60bfd (patch) | |
| tree | 19c43051d7b591c82f2c7a986bae48dfee927b0c /loader | |
| parent | c1d937d60b796aae0581d04932f519c55bf07690 (diff) | |
| download | usermoji-f57e73d2d642b0b21925428ed649a203e8b60bfd.tar.xz | |
vulkan.h: Fix up warnings and use VkObject appropriately
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/loader.c | 2 | ||||
| -rw-r--r-- | loader/loader.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/loader/loader.c b/loader/loader.c index a2d7cf7a..de296fa9 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1252,7 +1252,7 @@ LOADER_EXPORT VkResult VKAPI vkEnumeratePhysicalDevices( get_proc_addr, gpus[i]); /* Verify ICD compatibility */ - if (!valid_loader_magic_value((void*) gpus[i])) { + if (!valid_loader_magic_value(gpus[i])) { loader_log(VK_DBG_MSG_WARNING, 0, "Loader: Incompatible ICD, first dword must be initialized to ICD_LOADER_MAGIC. See loader/README.md for details.\n"); assert(0); diff --git a/loader/loader.h b/loader/loader.h index ce157bf1..9e2c2da7 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -43,17 +43,17 @@ # define LOADER_EXPORT #endif -static inline void loader_set_data(void *obj, const void *data) +static inline void loader_set_data(VkObject obj, const void *data) { *((const void **) obj) = data; } -static inline void *loader_get_data(const void *obj) +static inline void *loader_get_data(const VkObject obj) { return *((void **) obj); } -static inline void loader_init_data(void *obj, const void *data) +static inline void loader_init_data(VkObject obj, const void *data) { #ifdef DEBUG assert(valid_loader_magic_value(obj) && |