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)
diff --git a/icd/common/icd-instance.h b/icd/common/icd-instance.h
index 43f3179..9b7093c 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 @@
#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 @@
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 @@
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);