debug_report: rename object type and error bits

Conflicts:
	demos/tri.c
	layers/device_limits.cpp
	layers/draw_state.cpp
	layers/image.cpp
	layers/mem_tracker.cpp
	layers/param_checker.cpp
	layers/vk_layer_logging.h
	loader/debug_report.c
	tests/layer_validation_tests.cpp
This commit is contained in:
Courtney Goeltzenleuchter 2015-12-09 15:48:16 -07:00 committed by Mark Lobodzinski
parent 39033a8239
commit ec1d0b277b

View file

@ -5,7 +5,7 @@
#pragma once #pragma once
#include "vulkan/vulkan.h" #include "vulkan/vulkan.h"
#include <vulkan/vk_lunarg_debug_report.h> #include <vulkan/vk_ext_debug_report.h>
#include "vulkan/vk_lunarg_debug_marker.h" #include "vulkan/vk_lunarg_debug_marker.h"
#if defined(__GNUC__) && __GNUC__ >= 4 #if defined(__GNUC__) && __GNUC__ >= 4
# define VK_LAYER_EXPORT __attribute__((visibility("default"))) # define VK_LAYER_EXPORT __attribute__((visibility("default")))
@ -174,9 +174,9 @@ typedef struct VkLayerInstanceDispatchTable_
PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR GetPhysicalDeviceSurfaceCapabilitiesKHR; PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR GetPhysicalDeviceSurfaceCapabilitiesKHR;
PFN_vkGetPhysicalDeviceSurfaceFormatsKHR GetPhysicalDeviceSurfaceFormatsKHR; PFN_vkGetPhysicalDeviceSurfaceFormatsKHR GetPhysicalDeviceSurfaceFormatsKHR;
PFN_vkGetPhysicalDeviceSurfacePresentModesKHR GetPhysicalDeviceSurfacePresentModesKHR; PFN_vkGetPhysicalDeviceSurfacePresentModesKHR GetPhysicalDeviceSurfacePresentModesKHR;
PFN_vkCreateDebugReportCallbackLUNARG CreateDebugReportCallbackLUNARG; PFN_vkCreateDebugReportCallbackEXT CreateDebugReportCallbackEXT;
PFN_vkDestroyDebugReportCallbackLUNARG DestroyDebugReportCallbackLUNARG; PFN_vkDestroyDebugReportCallbackEXT DestroyDebugReportCallbackEXT;
PFN_vkDebugReportMessageLUNARG DebugReportMessageLUNARG; PFN_vkDebugReportMessageEXT DebugReportMessageEXT;
#ifdef VK_USE_PLATFORM_MIR_KHR #ifdef VK_USE_PLATFORM_MIR_KHR
PFN_vkCreateMirSurfaceKHR CreateMirSurfaceKHR; PFN_vkCreateMirSurfaceKHR CreateMirSurfaceKHR;
PFN_vkGetPhysicalDeviceMirPresentationSupportKHR GetPhysicalDeviceMirPresentationSupportKHR; PFN_vkGetPhysicalDeviceMirPresentationSupportKHR GetPhysicalDeviceMirPresentationSupportKHR;
@ -205,8 +205,8 @@ typedef struct VkLayerInstanceDispatchTable_
// LL node for tree of dbg callback functions // LL node for tree of dbg callback functions
typedef struct VkLayerDbgFunctionNode_ typedef struct VkLayerDbgFunctionNode_
{ {
VkDebugReportCallbackLUNARG msgCallback; VkDebugReportCallbackEXT msgCallback;
PFN_vkDebugReportCallbackLUNARG pfnMsgCallback; PFN_vkDebugReportCallbackEXT pfnMsgCallback;
VkFlags msgFlags; VkFlags msgFlags;
const void *pUserData; const void *pUserData;
struct VkLayerDbgFunctionNode_ *pNext; struct VkLayerDbgFunctionNode_ *pNext;