From a4131c4e8a3027dbda941e43992fa2435801247e Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Wed, 8 Apr 2015 15:36:08 -0600 Subject: 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) --- loader/loader.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'loader/loader.h') 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 -#include +#include +#include #if defined(WIN32) // FIXME: NEED WINDOWS EQUIVALENT #else // WIN32 -#include +#include #endif // WIN32 -#include -#include +#include +#include #include #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 */ -- cgit v1.2.3