From 7e03b1a0efe5f2bf6ec16980c9d2a6027b227bb7 Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Tue, 24 May 2016 16:04:56 -0600 Subject: layers: Move debug action enums from vk_layer.h Moved debug-report related items from vk_layer.h. Enums are now in vk_layer_logging.h and DbgFunctionNode has been moved into a new loader header file vk_loader_layer.h. Change-Id: I6031146ba474ff01ca039da44ad5d42d054383a3 --- loader/CMakeLists.txt | 1 + loader/loader.h | 3 ++- loader/vk_loader_layer.h | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 loader/vk_loader_layer.h (limited to 'loader') diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index f47ee589..15577b8a 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -17,6 +17,7 @@ set(NORMAL_LOADER_SRCS loader.c loader.h vk_loader_platform.h + vk_loader_layer.h trampoline.c wsi.c wsi.h diff --git a/loader/loader.h b/loader/loader.h index 95803c01..ecc945ed 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -30,8 +30,9 @@ #include #include "vk_loader_platform.h" - +#include "vk_loader_layer.h" #include + #include #include diff --git a/loader/vk_loader_layer.h b/loader/vk_loader_layer.h new file mode 100644 index 00000000..2207c029 --- /dev/null +++ b/loader/vk_loader_layer.h @@ -0,0 +1,32 @@ +/* +* +* Copyright (c) 2016 The Khronos Group Inc. +* Copyright (c) 2016 Valve Corporation +* Copyright (c) 2016 LunarG, Inc. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +* Author: Mark Lobodzinski +* +*/ +#pragma once + +// Linked list node for tree of debug callback functions +typedef struct VkLayerDbgFunctionNode_ { + VkDebugReportCallbackEXT msgCallback; + PFN_vkDebugReportCallbackEXT pfnMsgCallback; + VkFlags msgFlags; + void *pUserData; + struct VkLayerDbgFunctionNode_ *pNext; +} VkLayerDbgFunctionNode; + -- cgit v1.2.3