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 /icd/common/icd-instance.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 'icd/common/icd-instance.h')
| -rw-r--r-- | icd/common/icd-instance.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/icd/common/icd-instance.h b/icd/common/icd-instance.h index 43f3179c..9b7093cf 100644 --- a/icd/common/icd-instance.h +++ b/icd/common/icd-instance.h @@ -1,5 +1,5 @@ /* - * XGL + * Vulkan * * Copyright (C) 2014-2015 LunarG, Inc. * @@ -36,7 +36,7 @@ extern "C" { #endif struct icd_instance_logger { - XGL_DBG_MSG_CALLBACK_FUNCTION func; + VK_DBG_MSG_CALLBACK_FUNCTION func; void *user_data; struct icd_instance_logger *next; @@ -49,21 +49,21 @@ struct icd_instance { bool break_on_error; bool break_on_warning; - XGL_ALLOC_CALLBACKS alloc_cb; + VK_ALLOC_CALLBACKS alloc_cb; struct icd_instance_logger *loggers; }; -struct icd_instance *icd_instance_create(const XGL_APPLICATION_INFO *app_info, - const XGL_ALLOC_CALLBACKS *alloc_cb); +struct icd_instance *icd_instance_create(const VK_APPLICATION_INFO *app_info, + const VK_ALLOC_CALLBACKS *alloc_cb); void icd_instance_destroy(struct icd_instance *instance); -XGL_RESULT icd_instance_set_bool(struct icd_instance *instance, - XGL_DBG_GLOBAL_OPTION option, bool yes); +VK_RESULT icd_instance_set_bool(struct icd_instance *instance, + VK_DBG_GLOBAL_OPTION option, bool yes); static inline void *icd_instance_alloc(const struct icd_instance *instance, size_t size, size_t alignment, - XGL_SYSTEM_ALLOC_TYPE type) + VK_SYSTEM_ALLOC_TYPE type) { return instance->alloc_cb.pfnAlloc(instance->alloc_cb.pUserData, size, alignment, type); @@ -75,16 +75,16 @@ static inline void icd_instance_free(const struct icd_instance *instance, instance->alloc_cb.pfnFree(instance->alloc_cb.pUserData, ptr); } -XGL_RESULT icd_instance_add_logger(struct icd_instance *instance, - XGL_DBG_MSG_CALLBACK_FUNCTION func, +VK_RESULT icd_instance_add_logger(struct icd_instance *instance, + VK_DBG_MSG_CALLBACK_FUNCTION func, void *user_data); -XGL_RESULT icd_instance_remove_logger(struct icd_instance *instance, - XGL_DBG_MSG_CALLBACK_FUNCTION func); +VK_RESULT icd_instance_remove_logger(struct icd_instance *instance, + VK_DBG_MSG_CALLBACK_FUNCTION func); void icd_instance_log(const struct icd_instance *instance, - XGL_DBG_MSG_TYPE msg_type, - XGL_VALIDATION_LEVEL validation_level, - XGL_BASE_OBJECT src_object, + VK_DBG_MSG_TYPE msg_type, + VK_VALIDATION_LEVEL validation_level, + VK_BASE_OBJECT src_object, size_t location, int32_t msg_code, const char *msg); |