debug_report: Rename VkDbgMsgCallback object
diff --git a/include/vulkan/vk_layer.h b/include/vulkan/vk_layer.h
index a2b25d2..471f8ff 100644
--- a/include/vulkan/vk_layer.h
+++ b/include/vulkan/vk_layer.h
@@ -204,7 +204,7 @@
// LL node for tree of dbg callback functions
typedef struct VkLayerDbgFunctionNode_
{
- VkDbgMsgCallback msgCallback;
+ VkDebugReportCallbackLUNARG msgCallback;
PFN_vkDbgMsgCallback pfnMsgCallback;
VkFlags msgFlags;
const void *pUserData;
diff --git a/include/vulkan/vk_lunarg_debug_report.h b/include/vulkan/vk_lunarg_debug_report.h
index 37793d8..5fc3de0 100644
--- a/include/vulkan/vk_lunarg_debug_report.h
+++ b/include/vulkan/vk_lunarg_debug_report.h
@@ -84,7 +84,7 @@
#define VK_EXT_LUNARG_DEBUG_REPORT_EXTENSION_NAME "VK_EXT_LUNARG_debug_report"
-VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDbgMsgCallback)
+VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDebugReportCallbackLUNARG)
// ------------------------------------------------------------------------------------------------
// Enumerations
@@ -127,8 +127,8 @@
// ------------------------------------------------------------------------------------------------
// API functions
-typedef VkResult (VKAPI_PTR *PFN_vkDbgCreateMsgCallback)(VkInstance instance, VkFlags msgFlags, const PFN_vkDbgMsgCallback pfnMsgCallback, void* pUserData, VkDbgMsgCallback* pMsgCallback);
-typedef VkResult (VKAPI_PTR *PFN_vkDbgDestroyMsgCallback)(VkInstance instance, VkDbgMsgCallback msgCallback);
+typedef VkResult (VKAPI_PTR *PFN_vkDbgCreateMsgCallback)(VkInstance instance, VkFlags msgFlags, const PFN_vkDbgMsgCallback pfnMsgCallback, void* pUserData, VkDebugReportCallbackLUNARG* pMsgCallback);
+typedef VkResult (VKAPI_PTR *PFN_vkDbgDestroyMsgCallback)(VkInstance instance, VkDebugReportCallbackLUNARG msgCallback);
#ifdef VK_PROTOTYPES
@@ -138,11 +138,11 @@
VkFlags msgFlags,
const PFN_vkDbgMsgCallback pfnMsgCallback,
void* pUserData,
- VkDbgMsgCallback* pMsgCallback);
+ VkDebugReportCallbackLUNARG* pMsgCallback);
VKAPI_ATTR VkResult VKAPI_CALL vkDbgDestroyMsgCallback(
VkInstance instance,
- VkDbgMsgCallback msgCallback);
+ VkDebugReportCallbackLUNARG msgCallback);
#endif // VK_PROTOTYPES
diff --git a/layers/device_limits.cpp b/layers/device_limits.cpp
index aba2e3e..c4e67c2 100644
--- a/layers/device_limits.cpp
+++ b/layers/device_limits.cpp
@@ -58,7 +58,7 @@
// This struct will be stored in a map hashed by the dispatchable object
struct layer_data {
debug_report_data *report_data;
- std::vector<VkDbgMsgCallback> logging_callback;
+ std::vector<VkDebugReportCallbackLUNARG> logging_callback;
VkLayerDispatchTable* device_dispatch_table;
VkLayerInstanceDispatchTable* instance_dispatch_table;
devExts device_extensions;
@@ -105,7 +105,7 @@
uint32_t debug_action = 0;
FILE *log_output = NULL;
const char *option_str;
- VkDbgMsgCallback callback;
+ VkDebugReportCallbackLUNARG callback;
// initialize DeviceLimits options
report_flags = getLayerOptionFlags("DeviceLimitsReportFlags", 0);
getLayerOptionEnum("DeviceLimitsDebugAction", (uint32_t *) &debug_action);
@@ -190,7 +190,7 @@
// Clean up logging callback, if any
while (my_data->logging_callback.size() > 0) {
- VkDbgMsgCallback callback = my_data->logging_callback.back();
+ VkDebugReportCallbackLUNARG callback = my_data->logging_callback.back();
layer_destroy_msg_callback(my_data->report_data, callback);
my_data->logging_callback.pop_back();
}
@@ -555,7 +555,7 @@
VkFlags msgFlags,
const PFN_vkDbgMsgCallback pfnMsgCallback,
void* pUserData,
- VkDbgMsgCallback* pMsgCallback)
+ VkDebugReportCallbackLUNARG* pMsgCallback)
{
layer_data *my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map);
VkResult res = my_data->instance_dispatch_table->DbgCreateMsgCallback(instance, msgFlags, pfnMsgCallback, pUserData, pMsgCallback);
@@ -567,7 +567,7 @@
VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgDestroyMsgCallback(
VkInstance instance,
- VkDbgMsgCallback msgCallback)
+ VkDebugReportCallbackLUNARG msgCallback)
{
layer_data *my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map);
VkResult res = my_data->instance_dispatch_table->DbgDestroyMsgCallback(instance, msgCallback);
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index a9f30fb..5ad5ee4 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -87,7 +87,7 @@
struct layer_data {
debug_report_data* report_data;
- std::vector<VkDbgMsgCallback> logging_callback;
+ std::vector<VkDebugReportCallbackLUNARG> logging_callback;
VkLayerDispatchTable* device_dispatch_table;
VkLayerInstanceDispatchTable* instance_dispatch_table;
devExts device_extensions;
@@ -2560,7 +2560,7 @@
uint32_t debug_action = 0;
FILE *log_output = NULL;
const char *option_str;
- VkDbgMsgCallback callback;
+ VkDebugReportCallbackLUNARG callback;
// initialize DrawState options
report_flags = getLayerOptionFlags("DrawStateReportFlags", 0);
getLayerOptionEnum("DrawStateDebugAction", (uint32_t *) &debug_action);
@@ -2616,7 +2616,7 @@
// Clean up logging callback, if any
while (my_data->logging_callback.size() > 0) {
- VkDbgMsgCallback callback = my_data->logging_callback.back();
+ VkDebugReportCallbackLUNARG callback = my_data->logging_callback.back();
layer_destroy_msg_callback(my_data->report_data, callback);
my_data->logging_callback.pop_back();
}
@@ -5414,7 +5414,7 @@
VkFlags msgFlags,
const PFN_vkDbgMsgCallback pfnMsgCallback,
void* pUserData,
- VkDbgMsgCallback* pMsgCallback)
+ VkDebugReportCallbackLUNARG* pMsgCallback)
{
layer_data* my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map);
VkResult res = my_data->instance_dispatch_table->DbgCreateMsgCallback(instance, msgFlags, pfnMsgCallback, pUserData, pMsgCallback);
@@ -5426,7 +5426,7 @@
VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgDestroyMsgCallback(
VkInstance instance,
- VkDbgMsgCallback msgCallback)
+ VkDebugReportCallbackLUNARG msgCallback)
{
layer_data* my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map);
VkResult res = my_data->instance_dispatch_table->DbgDestroyMsgCallback(instance, msgCallback);
diff --git a/layers/generic.h b/layers/generic.h
index 2eb3eec..7a145d7 100644
--- a/layers/generic.h
+++ b/layers/generic.h
@@ -36,7 +36,7 @@
// The following is for logging error messages:
struct layer_data {
debug_report_data *report_data;
- VkDbgMsgCallback logging_callback;
+ VkDebugReportCallbackLUNARG logging_callback;
layer_data() :
report_data(nullptr),
diff --git a/layers/image.cpp b/layers/image.cpp
index 2156c5f..e489286 100644
--- a/layers/image.cpp
+++ b/layers/image.cpp
@@ -53,7 +53,7 @@
struct layer_data {
debug_report_data *report_data;
- vector<VkDbgMsgCallback> logging_callback;
+ vector<VkDebugReportCallbackLUNARG> logging_callback;
VkLayerDispatchTable* device_dispatch_table;
VkLayerInstanceDispatchTable *instance_dispatch_table;
VkPhysicalDevice physicalDevice;
@@ -74,7 +74,7 @@
static void InitImage(layer_data *data, const VkAllocationCallbacks *pAllocator)
{
- VkDbgMsgCallback callback;
+ VkDebugReportCallbackLUNARG callback;
uint32_t report_flags = getLayerOptionFlags("ImageReportFlags", 0);
uint32_t debug_action = 0;
@@ -99,7 +99,7 @@
VkFlags msgFlags,
const PFN_vkDbgMsgCallback pfnMsgCallback,
void* pUserData,
- VkDbgMsgCallback* pMsgCallback)
+ VkDebugReportCallbackLUNARG* pMsgCallback)
{
layer_data *my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map);
VkResult res = my_data->instance_dispatch_table->DbgCreateMsgCallback(instance, msgFlags, pfnMsgCallback, pUserData, pMsgCallback);
@@ -111,7 +111,7 @@
VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgDestroyMsgCallback(
VkInstance instance,
- VkDbgMsgCallback msgCallback)
+ VkDebugReportCallbackLUNARG msgCallback)
{
layer_data *my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map);
VkResult res = my_data->instance_dispatch_table->DbgDestroyMsgCallback(instance, msgCallback);
@@ -144,7 +144,7 @@
// Clean up logging callback, if any
while (my_data->logging_callback.size() > 0) {
- VkDbgMsgCallback callback = my_data->logging_callback.back();
+ VkDebugReportCallbackLUNARG callback = my_data->logging_callback.back();
layer_destroy_msg_callback(my_data->report_data, callback);
my_data->logging_callback.pop_back();
}
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index cf889f6..bd65bcb 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -54,7 +54,7 @@
struct layer_data {
debug_report_data *report_data;
- std::vector<VkDbgMsgCallback> logging_callback;
+ std::vector<VkDebugReportCallbackLUNARG> logging_callback;
VkLayerDispatchTable *device_dispatch_table;
VkLayerInstanceDispatchTable *instance_dispatch_table;
VkBool32 wsi_enabled;
@@ -1001,7 +1001,7 @@
uint32_t debug_action = 0;
FILE *log_output = NULL;
const char *option_str;
- VkDbgMsgCallback callback;
+ VkDebugReportCallbackLUNARG callback;
// initialize MemTracker options
report_flags = getLayerOptionFlags("MemTrackerReportFlags", 0);
getLayerOptionEnum("MemTrackerDebugAction", (uint32_t *) &debug_action);
@@ -1042,7 +1042,7 @@
// Clean up logging callback, if any
while (my_data->logging_callback.size() > 0) {
- VkDbgMsgCallback callback = my_data->logging_callback.back();
+ VkDebugReportCallbackLUNARG callback = my_data->logging_callback.back();
layer_destroy_msg_callback(my_data->report_data, callback);
my_data->logging_callback.pop_back();
}
@@ -2562,11 +2562,11 @@
}
VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgCreateMsgCallback(
- VkInstance instance,
- VkFlags msgFlags,
- const PFN_vkDbgMsgCallback pfnMsgCallback,
- void *pUserData,
- VkDbgMsgCallback *pMsgCallback)
+ VkInstance instance,
+ VkFlags msgFlags,
+ const PFN_vkDbgMsgCallback pfnMsgCallback,
+ void *pUserData,
+ VkDebugReportCallbackLUNARG *pMsgCallback)
{
layer_data *my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map);
VkLayerInstanceDispatchTable *pTable = my_data->instance_dispatch_table;
@@ -2579,7 +2579,7 @@
VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgDestroyMsgCallback(
VkInstance instance,
- VkDbgMsgCallback msgCallback)
+ VkDebugReportCallbackLUNARG msgCallback)
{
layer_data *my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map);
VkLayerInstanceDispatchTable *pTable = my_data->instance_dispatch_table;
diff --git a/layers/object_track.h b/layers/object_track.h
index 7c0ea6d..1410151 100644
--- a/layers/object_track.h
+++ b/layers/object_track.h
@@ -75,7 +75,7 @@
struct layer_data {
debug_report_data *report_data;
//TODO: put instance data here
- VkDbgMsgCallback logging_callback;
+ VkDebugReportCallbackLUNARG logging_callback;
bool wsi_enabled;
bool objtrack_extensions_enabled;
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 62fd2a7..42068a9 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -48,7 +48,7 @@
struct layer_data {
debug_report_data *report_data;
- std::vector<VkDbgMsgCallback> logging_callback;
+ std::vector<VkDebugReportCallbackLUNARG> logging_callback;
layer_data() :
report_data(nullptr)
@@ -86,7 +86,7 @@
static void InitParamChecker(layer_data *data, const VkAllocationCallbacks *pAllocator)
{
- VkDbgMsgCallback callback;
+ VkDebugReportCallbackLUNARG callback;
uint32_t report_flags = getLayerOptionFlags("ParamCheckerReportFlags", 0);
uint32_t debug_action = 0;
@@ -111,7 +111,7 @@
VkFlags msgFlags,
const PFN_vkDbgMsgCallback pfnMsgCallback,
void* pUserData,
- VkDbgMsgCallback* pMsgCallback)
+ VkDebugReportCallbackLUNARG* pMsgCallback)
{
VkLayerInstanceDispatchTable *pTable = get_dispatch_table(pc_instance_table_map, instance);
VkResult result = pTable->DbgCreateMsgCallback(instance, msgFlags, pfnMsgCallback, pUserData, pMsgCallback);
@@ -127,7 +127,7 @@
VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgDestroyMsgCallback(
VkInstance instance,
- VkDbgMsgCallback msgCallback)
+ VkDebugReportCallbackLUNARG msgCallback)
{
VkLayerInstanceDispatchTable *pTable = get_dispatch_table(pc_instance_table_map, instance);
VkResult result = pTable->DbgDestroyMsgCallback(instance, msgCallback);
@@ -1759,7 +1759,7 @@
// Clean up logging callback, if any
layer_data *my_data = get_my_data_ptr(key, layer_data_map);
while (my_data->logging_callback.size() > 0) {
- VkDbgMsgCallback callback = my_data->logging_callback.back();
+ VkDebugReportCallbackLUNARG callback = my_data->logging_callback.back();
layer_destroy_msg_callback(my_data->report_data, callback);
my_data->logging_callback.pop_back();
}
diff --git a/layers/swapchain.cpp b/layers/swapchain.cpp
index 08ee63d..4c41928 100644
--- a/layers/swapchain.cpp
+++ b/layers/swapchain.cpp
@@ -115,7 +115,7 @@
uint32_t debug_action = 0;
FILE *log_output = NULL;
const char *option_str;
- VkDbgMsgCallback callback;
+ VkDebugReportCallbackLUNARG callback;
// Initialize Swapchain options:
report_flags = getLayerOptionFlags("SwapchainReportFlags", 0);
@@ -209,7 +209,7 @@
// Clean up logging callback, if any
while (my_data->logging_callback.size() > 0) {
- VkDbgMsgCallback callback = my_data->logging_callback.back();
+ VkDebugReportCallbackLUNARG callback = my_data->logging_callback.back();
layer_destroy_msg_callback(my_data->report_data, callback);
my_data->logging_callback.pop_back();
}
@@ -1113,7 +1113,7 @@
return NULL;
}
-VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgCreateMsgCallback(VkInstance instance, VkFlags msgFlags, const PFN_vkDbgMsgCallback pfnMsgCallback, void* pUserData, VkDbgMsgCallback* pMsgCallback)
+VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgCreateMsgCallback(VkInstance instance, VkFlags msgFlags, const PFN_vkDbgMsgCallback pfnMsgCallback, void* pUserData, VkDebugReportCallbackLUNARG* pMsgCallback)
{
layer_data *my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map);
VkResult result = my_data->instance_dispatch_table->DbgCreateMsgCallback(instance, msgFlags, pfnMsgCallback, pUserData, pMsgCallback);
@@ -1123,7 +1123,7 @@
return result;
}
-VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgDestroyMsgCallback(VkInstance instance, VkDbgMsgCallback msgCallback)
+VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgDestroyMsgCallback(VkInstance instance, VkDebugReportCallbackLUNARG msgCallback)
{
layer_data *my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map);
VkResult result = my_data->instance_dispatch_table->DbgDestroyMsgCallback(instance, msgCallback);
diff --git a/layers/swapchain.h b/layers/swapchain.h
index c2ee487..d030a34 100644
--- a/layers/swapchain.h
+++ b/layers/swapchain.h
@@ -210,7 +210,7 @@
struct layer_data {
debug_report_data *report_data;
- std::vector<VkDbgMsgCallback> logging_callback;
+ std::vector<VkDebugReportCallbackLUNARG> logging_callback;
VkLayerDispatchTable* device_dispatch_table;
VkLayerInstanceDispatchTable* instance_dispatch_table;
// NOTE: The following are for keeping track of info that is used for
diff --git a/layers/threading.h b/layers/threading.h
index cbff088..24741dc 100644
--- a/layers/threading.h
+++ b/layers/threading.h
@@ -38,7 +38,7 @@
struct layer_data {
debug_report_data *report_data;
- VkDbgMsgCallback logging_callback;
+ VkDebugReportCallbackLUNARG logging_callback;
layer_data() :
report_data(nullptr),
diff --git a/layers/vk_layer_logging.h b/layers/vk_layer_logging.h
index 8a38d42..b603da8 100644
--- a/layers/vk_layer_logging.h
+++ b/layers/vk_layer_logging.h
@@ -152,7 +152,7 @@
VkFlags msgFlags,
const PFN_vkDbgMsgCallback pfnMsgCallback,
void *pUserData,
- VkDbgMsgCallback *pMsgCallback)
+ VkDebugReportCallbackLUNARG *pMsgCallback)
{
VkLayerDbgFunctionNode *pNewDbgFuncNode = (VkLayerDbgFunctionNode*)malloc(sizeof(VkLayerDbgFunctionNode));
if (!pNewDbgFuncNode)
@@ -160,7 +160,7 @@
// Handle of 0 is logging_callback so use allocated Node address as unique handle
if (!(*pMsgCallback))
- *pMsgCallback = (VkDbgMsgCallback) pNewDbgFuncNode;
+ *pMsgCallback = (VkDebugReportCallbackLUNARG) pNewDbgFuncNode;
pNewDbgFuncNode->msgCallback = *pMsgCallback;
pNewDbgFuncNode->pfnMsgCallback = pfnMsgCallback;
pNewDbgFuncNode->msgFlags = msgFlags;
@@ -181,7 +181,7 @@
static inline void layer_destroy_msg_callback(
debug_report_data *debug_data,
- VkDbgMsgCallback msg_callback)
+ VkDebugReportCallbackLUNARG msg_callback)
{
VkLayerDbgFunctionNode *pTrav = debug_data->g_pDbgFunctionHead;
VkLayerDbgFunctionNode *pPrev = pTrav;
diff --git a/loader/debug_report.c b/loader/debug_report.c
index cadb70c..b7057e6 100644
--- a/loader/debug_report.c
+++ b/loader/debug_report.c
@@ -70,7 +70,7 @@
VkFlags msgFlags,
const PFN_vkDbgMsgCallback pfnMsgCallback,
void* pUserData,
- VkDbgMsgCallback* pMsgCallback)
+ VkDebugReportCallbackLUNARG* pMsgCallback)
{
VkLayerDbgFunctionNode *pNewDbgFuncNode = (VkLayerDbgFunctionNode *) loader_heap_alloc((struct loader_instance *)instance, sizeof(VkLayerDbgFunctionNode), VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
if (!pNewDbgFuncNode)
@@ -95,7 +95,7 @@
static VKAPI_ATTR VkResult VKAPI_CALL debug_report_DbgDestroyMsgCallback(
VkInstance instance,
- VkDbgMsgCallback msg_callback)
+ VkDebugReportCallbackLUNARG msg_callback)
{
struct loader_instance *inst = loader_get_instance(instance);
loader_platform_thread_lock_mutex(&loader_lock);
@@ -131,9 +131,9 @@
VkFlags msgFlags,
const PFN_vkDbgMsgCallback pfnMsgCallback,
void* pUserData,
- VkDbgMsgCallback* pMsgCallback)
+ VkDebugReportCallbackLUNARG* pMsgCallback)
{
- VkDbgMsgCallback *icd_info;
+ VkDebugReportCallbackLUNARG *icd_info;
const struct loader_icd *icd;
struct loader_instance *inst;
VkResult res;
@@ -144,7 +144,7 @@
break;
}
- icd_info = calloc(sizeof(VkDbgMsgCallback), inst->total_icd_count);
+ icd_info = calloc(sizeof(VkDebugReportCallbackLUNARG), inst->total_icd_count);
if (!icd_info) {
return VK_ERROR_OUT_OF_HOST_MEMORY;
}
@@ -183,7 +183,7 @@
return res;
}
- *(VkDbgMsgCallback **)pMsgCallback = icd_info;
+ *(VkDebugReportCallbackLUNARG **)pMsgCallback = icd_info;
return VK_SUCCESS;
}
@@ -194,10 +194,10 @@
*/
VKAPI_ATTR VkResult VKAPI_CALL loader_DbgDestroyMsgCallback(
VkInstance instance,
- VkDbgMsgCallback msgCallback)
+ VkDebugReportCallbackLUNARG msgCallback)
{
uint32_t storage_idx;
- VkDbgMsgCallback *icd_info;
+ VkDebugReportCallbackLUNARG *icd_info;
const struct loader_icd *icd;
VkResult res = VK_SUCCESS;
struct loader_instance *inst;
@@ -207,7 +207,7 @@
break;
}
- icd_info = *(VkDbgMsgCallback **) &msgCallback;
+ icd_info = *(VkDebugReportCallbackLUNARG **) &msgCallback;
storage_idx = 0;
for (icd = inst->icds; icd; icd = icd->next) {
if (icd_info[storage_idx]) {
diff --git a/loader/debug_report.h b/loader/debug_report.h
index 722e0c8..a6107a7 100644
--- a/loader/debug_report.h
+++ b/loader/debug_report.h
@@ -107,8 +107,8 @@
VkFlags msgFlags,
const PFN_vkDbgMsgCallback pfnMsgCallback,
void* pUserData,
- VkDbgMsgCallback* pMsgCallback);
+ VkDebugReportCallbackLUNARG* pMsgCallback);
VKAPI_ATTR VkResult VKAPI_CALL loader_DbgDestroyMsgCallback(
VkInstance instance,
- VkDbgMsgCallback msgCallback);
+ VkDebugReportCallbackLUNARG msgCallback);
diff --git a/loader/loader.h b/loader/loader.h
index 1c1dd2d..2b44de3 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -341,8 +341,8 @@
extern const VkLayerInstanceDispatchTable instance_disp;
struct loader_msg_callback_map_entry {
- VkDbgMsgCallback icd_obj;
- VkDbgMsgCallback loader_obj;
+ VkDebugReportCallbackLUNARG icd_obj;
+ VkDebugReportCallbackLUNARG loader_obj;
};
bool compare_vk_extension_properties(
diff --git a/tests/vkrenderframework.h b/tests/vkrenderframework.h
index 6f16e67..85682ca 100644
--- a/tests/vkrenderframework.h
+++ b/tests/vkrenderframework.h
@@ -142,8 +142,8 @@
VkDepthStencilObj *m_depthStencil;
PFN_vkDbgCreateMsgCallback m_dbgCreateMsgCallback;
PFN_vkDbgDestroyMsgCallback m_dbgDestroyMsgCallback;
- VkDbgMsgCallback m_globalMsgCallback;
- VkDbgMsgCallback m_devMsgCallback;
+ VkDebugReportCallbackLUNARG m_globalMsgCallback;
+ VkDebugReportCallbackLUNARG m_devMsgCallback;
/*
* SetUp and TearDown are called by the Google Test framework
diff --git a/vk-layer-generate.py b/vk-layer-generate.py
index 41eef8b..43bd11c 100755
--- a/vk-layer-generate.py
+++ b/vk-layer-generate.py
@@ -227,7 +227,7 @@
def _gen_create_msg_callback(self):
r_body = []
r_body.append('%s' % self.lineinfo.get())
- r_body.append('VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgCreateMsgCallback(VkInstance instance, VkFlags msgFlags, const PFN_vkDbgMsgCallback pfnMsgCallback, void* pUserData, VkDbgMsgCallback* pMsgCallback)')
+ r_body.append('VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgCreateMsgCallback(VkInstance instance, VkFlags msgFlags, const PFN_vkDbgMsgCallback pfnMsgCallback, void* pUserData, VkDebugReportCallbackLUNARG* pMsgCallback)')
r_body.append('{')
# Switch to this code section for the new per-instance storage and debug callbacks
if self.layer_name == 'ObjectTracker' or self.layer_name == 'Threading':
@@ -251,7 +251,7 @@
def _gen_destroy_msg_callback(self):
r_body = []
r_body.append('%s' % self.lineinfo.get())
- r_body.append('VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgDestroyMsgCallback(VkInstance instance, VkDbgMsgCallback msgCallback)')
+ r_body.append('VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgDestroyMsgCallback(VkInstance instance, VkDebugReportCallbackLUNARG msgCallback)')
r_body.append('{')
# Switch to this code section for the new per-instance storage and debug callbacks
if self.layer_name == 'ObjectTracker' or self.layer_name == 'Threading':
diff --git a/vulkan.py b/vulkan.py
index 079dd09..1e32b2d 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -1121,7 +1121,7 @@
name="VK_LUNARG_DEBUG_REPORT",
headers=["vk_lunarg_debug_report.h"],
objects=[
- "VkDbgMsgCallback",
+ "VkDebugReportCallbackLUNARG",
],
protos=[
Proto("VkResult", "DbgCreateMsgCallback",
@@ -1129,11 +1129,11 @@
Param("VkFlags", "msgFlags"),
Param("const PFN_vkDbgMsgCallback", "pfnMsgCallback"),
Param("void*", "pUserData"),
- Param("VkDbgMsgCallback*", "pMsgCallback")]),
+ Param("VkDebugReportCallbackLUNARG*", "pMsgCallback")]),
Proto("VkResult", "DbgDestroyMsgCallback",
[Param("VkInstance", "instance"),
- Param("VkDbgMsgCallback", "msgCallback")]),
+ Param("VkDebugReportCallbackLUNARG", "msgCallback")]),
],
)
lunarg_debug_marker = Extension(
@@ -1203,7 +1203,7 @@
"VkFramebuffer",
"VkSwapchainKHR",
"VkSurfaceKHR",
- "VkDbgMsgCallback",
+ "VkDebugReportCallbackLUNARG",
]
object_type_list = object_dispatch_list + object_non_dispatch_list