diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-04-08 15:36:08 -0600 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2015-04-16 17:48:17 +0800 |
| commit | a4131c4e8a3027dbda941e43992fa2435801247e (patch) | |
| tree | 9b2d3b1526d31d16e3a57c5ff096794cd835b44f /loader/loader.h | |
| parent | 63b889ec0ae38e1ba1db8e1970f934caef51ce9e (diff) | |
| download | usermoji-a4131c4e8a3027dbda941e43992fa2435801247e.tar.xz | |
Stage 1 of rename
TODO: re-enable glave build, advance API for glave
v2: get rid of outdated code in tri introduced by rebase
rename wsi_null.c (olv)
Diffstat (limited to 'loader/loader.h')
| -rw-r--r-- | loader/loader.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/loader/loader.h b/loader/loader.h index d307c53e..1817386f 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -1,5 +1,5 @@ /* - * XGL + * Vulkan * * Copyright (C) 2014 LunarG, Inc. * @@ -28,15 +28,15 @@ #ifndef LOADER_H #define LOADER_H -#include <xgl.h> -#include <xglDbg.h> +#include <vulkan.h> +#include <vkDbg.h> #if defined(WIN32) // FIXME: NEED WINDOWS EQUIVALENT #else // WIN32 -#include <xglWsiX11Ext.h> +#include <vkWsiX11Ext.h> #endif // WIN32 -#include <xglLayer.h> -#include <xglIcd.h> +#include <vkLayer.h> +#include <vkIcd.h> #include <assert.h> #if defined(__GNUC__) && __GNUC__ >= 4 @@ -65,16 +65,16 @@ static inline void loader_init_data(void *obj, const void *data) loader_set_data(obj, data); } -static inline void *loader_unwrap_gpu(XGL_PHYSICAL_GPU *gpu) +static inline void *loader_unwrap_gpu(VK_PHYSICAL_GPU *gpu) { - const XGL_BASE_LAYER_OBJECT *wrap = (const XGL_BASE_LAYER_OBJECT *) *gpu; + const VK_BASE_LAYER_OBJECT *wrap = (const VK_BASE_LAYER_OBJECT *) *gpu; - *gpu = (XGL_PHYSICAL_GPU) wrap->nextObject; + *gpu = (VK_PHYSICAL_GPU) wrap->nextObject; return loader_get_data(wrap->baseObject); } -extern uint32_t loader_activate_layers(XGL_PHYSICAL_GPU gpu, const XGL_DEVICE_CREATE_INFO* pCreateInfo); +extern uint32_t loader_activate_layers(VK_PHYSICAL_GPU gpu, const VK_DEVICE_CREATE_INFO* pCreateInfo); #define MAX_LAYER_LIBRARIES 64 #endif /* LOADER_H */ |