diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ddfe3cb..e87ce95c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,10 +42,12 @@ SET(ULRE ULRE.Base ULRE.Platform MathGeoLib spirv-cross-core + glslang jsoncpp_lib ${RENDER_LIBRARY} ${Vulkan_LIBRARIES}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/glslang/glslang/Include) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/assimp/include) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/MathGeoLib/src) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/NvTriStrip) @@ -59,6 +61,7 @@ add_subdirectory(${SPIRV_CROSS_PATH}) SET(ULRE_RUNTIME_PATH ${CMAKE_CURRENT_SOURCE_DIR}) +add_subdirectory(3rdpty/glslang) add_subdirectory(3rdpty/MathGeoLib) add_subdirectory(3rdpty/NvTriStrip) add_subdirectory(3rdpty/assimp) diff --git a/src/RenderDevice/Vulkan/VKInstance.cpp b/src/RenderDevice/Vulkan/VKInstance.cpp index ead19dba..9f5b5878 100644 --- a/src/RenderDevice/Vulkan/VKInstance.cpp +++ b/src/RenderDevice/Vulkan/VKInstance.cpp @@ -159,8 +159,8 @@ Instance *CreateInstance(const UTF8String &app_name) // "VK_LAYER_NV_nsight-sys", - "VK_LAYER_GOOGLE_unique_objects", - "VK_LAYER_GOOGLE_threading" +// "VK_LAYER_GOOGLE_unique_objects", +// "VK_LAYER_GOOGLE_threading" }; inst_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; @@ -207,24 +207,40 @@ Instance::Instance(VkInstance i,CharPointerList &el) debug_report_callback=VK_NULL_HANDLE; { - VkDebugReportCallbackCreateInfoEXT create_info={}; + VkDebugReportCallbackCreateInfoEXT create_info; - create_info.sType=VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT; - create_info.pNext=nullptr; - create_info.flags=VK_DEBUG_REPORT_ERROR_BIT_EXT|VK_DEBUG_REPORT_WARNING_BIT_EXT|VK_DEBUG_REPORT_DEBUG_BIT_EXT|VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT; - create_info.pfnCallback=dbgFunc; - create_info.pUserData=nullptr; + create_info.sType =VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT; + create_info.pNext =nullptr; + + create_info.flags =VK_DEBUG_REPORT_ERROR_BIT_EXT + |VK_DEBUG_REPORT_WARNING_BIT_EXT + |VK_DEBUG_REPORT_DEBUG_BIT_EXT + |VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT; + + create_info.pfnCallback =dbgFunc; + create_info.pUserData =nullptr; CreateDebugReportCallbackEXT(inst,&create_info,nullptr,&debug_report_callback); } debug_messenger=VK_NULL_HANDLE; { - VkDebugUtilsMessengerCreateInfoEXT createInfo={}; - createInfo.sType=VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT; - createInfo.messageSeverity=VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT|VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT|VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT; - createInfo.messageType=VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT|VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT|VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT; - createInfo.pfnUserCallback=debugCallback; + VkDebugUtilsMessengerCreateInfoEXT createInfo; + + createInfo.sType =VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT; + createInfo.pNext =nullptr; + createInfo.flags =0; + + createInfo.messageSeverity =VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT + |VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT + |VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT; + + createInfo.messageType =VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT + |VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT + |VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT; + + createInfo.pfnUserCallback =debugCallback; + createInfo.pUserData =nullptr; CreateDebugUtilsMessengerEXT(inst,&createInfo,nullptr,&debug_messenger); }