diff --git a/CMSceneGraph b/CMSceneGraph index 3d5c287d..d4999fb4 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 3d5c287da5b5d5a52d73e80d9cc828a0f6f87a80 +Subproject commit d4999fb44535f0aa3d52295bad9a3f931d09f3a9 diff --git a/inc/hgl/graph/VK.h b/inc/hgl/graph/VK.h index 84186283..f1879402 100644 --- a/inc/hgl/graph/VK.h +++ b/inc/hgl/graph/VK.h @@ -2,10 +2,8 @@ #define HGL_GRAPH_VULKAN_INCLUDE #include -#include #include #include -#include #include #include #include @@ -187,61 +185,5 @@ inline void copy(VkExtent3D &e3d,const VkExtent2D &e2d,const uint32 depth=1) e3d.height =e2d.height; e3d.depth =depth; } - -inline void debug_out_vk_version(const uint32_t version) -{ - std::cout< -inline hgl::String VkUUID2String(const uint8_t *pipelineCacheUUID) -{ - T *hstr=new T[VK_UUID_SIZE*2+1]; - - DataToLowerHexStr(hstr,pipelineCacheUUID,VK_UUID_SIZE); - - return hgl::String::newOf(hstr,VK_UUID_SIZE*2); -} - -inline void debug_out(const char *front,const hgl::List &layer_properties) -{ - const int property_count=layer_properties.GetCount(); - - if(property_count<=0)return; - - const VkLayerProperties *lp=layer_properties.GetData(); - - for(int i=0;ilayerName<<" [spec: "; - debug_out_vk_version(lp->specVersion); - - std::cout<<", impl: "; - debug_out_vk_version(lp->implementationVersion); - - std::cout<<"] desc: "<description< &extension_properties) -{ - const int extension_count=extension_properties.GetCount(); - - if(extension_count<=0)return; - - VkExtensionProperties *ep=extension_properties.GetData(); - for(int i=0;iextensionName<<" ver: "; - - debug_out_vk_version(ep->specVersion); - - std::cout< +#include +#include + +VK_NAMESPACE_BEGIN + +inline void debug_out_vk_version(const uint32_t version) +{ + std::cout< &layer_properties) +{ + const int property_count=layer_properties.GetCount(); + + if(property_count<=0)return; + + const VkLayerProperties *lp=layer_properties.GetData(); + + for(int i=0;ilayerName<<" [spec: "; + debug_out_vk_version(lp->specVersion); + + std::cout<<", impl: "; + debug_out_vk_version(lp->implementationVersion); + + std::cout<<"] desc: "<description< &extension_properties) +{ + const int extension_count=extension_properties.GetCount(); + + if(extension_count<=0)return; + + VkExtensionProperties *ep=extension_properties.GetData(); + for(int i=0;iextensionName<<" ver: "; + + debug_out_vk_version(ep->specVersion); + + std::cout< #include #include +#include #include #include diff --git a/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp b/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp index 818958bd..ac87ab3b 100644 --- a/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp +++ b/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp @@ -1,5 +1,6 @@ #include #include +#include"DebugOutProperties.h" VK_NAMESPACE_BEGIN namespace diff --git a/src/SceneGraph/Vulkan/VKPipelineCache.cpp b/src/SceneGraph/Vulkan/VKPipelineCache.cpp index b023796e..ea0ce4e9 100644 --- a/src/SceneGraph/Vulkan/VKPipelineCache.cpp +++ b/src/SceneGraph/Vulkan/VKPipelineCache.cpp @@ -1,4 +1,5 @@ #include +#include #include #include #include diff --git a/src/SceneGraph/Vulkan/VKProperties.cpp b/src/SceneGraph/Vulkan/VKProperties.cpp index fd5baaf0..e7f8532b 100644 --- a/src/SceneGraph/Vulkan/VKProperties.cpp +++ b/src/SceneGraph/Vulkan/VKProperties.cpp @@ -1,5 +1,6 @@ #include #include +#include"DebugOutProperties.h" VK_NAMESPACE_BEGIN