From 3eb2bccaab23b2c574e8a56ed74a4e504b4b05b0 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Fri, 8 Nov 2019 17:41:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=BA=90=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=B2=A1=E6=9C=89=E7=94=A8UTF8-BOM=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E6=96=B9=E5=BC=8F=E4=BF=9D=E5=AD=98=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inc/hgl/graph/vulkan/VKDebugOut.h | 6 +++--- src/RenderDevice/Vulkan/VKDebugOut.cpp | 10 +++++----- src/RenderDevice/Vulkan/VKProperties.cpp | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/inc/hgl/graph/vulkan/VKDebugOut.h b/inc/hgl/graph/vulkan/VKDebugOut.h index 4462d648..280cac6e 100644 --- a/inc/hgl/graph/vulkan/VKDebugOut.h +++ b/inc/hgl/graph/vulkan/VKDebugOut.h @@ -1,4 +1,4 @@ -#ifndef HGL_GRAPH_VULKAN_DEBUG_OUT_INCLUDE +#ifndef HGL_GRAPH_VULKAN_DEBUG_OUT_INCLUDE #define HGL_GRAPH_VULKAN_DEBUG_OUT_INCLUDE #include @@ -8,8 +8,8 @@ VK_NAMESPACE_BEGIN const char *GetVkDebugReportObjectTypename(VkDebugReportObjectTypeEXT objType); /** - * Vulkan Ϣ
- * ҪԶĵϢӴ + * Vulkan 调试信息输出基类
+ * 如若需要自定义的调试信息输出,请从此类派生 */ class VKDebugOut { diff --git a/src/RenderDevice/Vulkan/VKDebugOut.cpp b/src/RenderDevice/Vulkan/VKDebugOut.cpp index da543f20..f7e3a358 100644 --- a/src/RenderDevice/Vulkan/VKDebugOut.cpp +++ b/src/RenderDevice/Vulkan/VKDebugOut.cpp @@ -1,4 +1,4 @@ -#include +#include #include VK_NAMESPACE_BEGIN @@ -45,7 +45,7 @@ namespace "DESCRIPTOR_UPDATE_TEMPLATE", "ACCELERATION_STRUCTURE_NV" }; -}//namespace +}//namespace const char *GetVkDebugReportObjectTypename(VkDebugReportObjectTypeEXT objType) { @@ -80,7 +80,7 @@ namespace func(instance,debugMessenger,pAllocator); } } - + VkBool32 DefaultVulkanDebugUtilsMessage(VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, VkDebugUtilsMessageTypeFlagsEXT messageType, const VkDebugUtilsMessengerCallbackDataEXT *pCallbackData) @@ -103,7 +103,7 @@ namespace if(!pUserData) return DefaultVulkanDebugUtilsMessage(messageSeverity,messageType,pCallbackData); - else + else return ((VKDebugOut *)pUserData)->OnDebugUtilsMessage(messageSeverity,messageType,pCallbackData); } @@ -233,4 +233,4 @@ VkBool32 VKDebugOut::OnDebugReport(VkDebugReportFlagsEXT msgFlags,VkDebugReportO { return DefaultVulkanDebugReport(msgFlags,objType,srcObject,location,msgCode,pLayerPrefix,pMsg); } -VK_NAMESPACE_END \ No newline at end of file +VK_NAMESPACE_END diff --git a/src/RenderDevice/Vulkan/VKProperties.cpp b/src/RenderDevice/Vulkan/VKProperties.cpp index 6be018f8..d6d0dd7a 100644 --- a/src/RenderDevice/Vulkan/VKProperties.cpp +++ b/src/RenderDevice/Vulkan/VKProperties.cpp @@ -1,8 +1,8 @@ -#include +#include VK_NAMESPACE_BEGIN -namespace +namespace { static List layer_properties; static List extension_properties;