hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加glslang到工程中

Browse Source
This commit is contained in:
hyzboy 2019-08-10 22:06:18 +08:00
parent 5659a5a107
commit 282c2aff84
2 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -42,10 +42,12 @@ SET(ULRE ULRE.Base
ULRE.Platform ULRE.Platform
MathGeoLib MathGeoLib
spirv-cross-core spirv-cross-core
glslang
jsoncpp_lib jsoncpp_lib
${RENDER_LIBRARY} ${RENDER_LIBRARY}
${Vulkan_LIBRARIES}) ${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/assimp/include)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/MathGeoLib/src) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/MathGeoLib/src)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/NvTriStrip) 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}) SET(ULRE_RUNTIME_PATH ${CMAKE_CURRENT_SOURCE_DIR})
add_subdirectory(3rdpty/glslang)
add_subdirectory(3rdpty/MathGeoLib) add_subdirectory(3rdpty/MathGeoLib)
add_subdirectory(3rdpty/NvTriStrip) add_subdirectory(3rdpty/NvTriStrip)
add_subdirectory(3rdpty/assimp) add_subdirectory(3rdpty/assimp)

42
src/RenderDevice/Vulkan/VKInstance.cpp
View File

@ -159,8 +159,8 @@ Instance *CreateInstance(const UTF8String &app_name)
// "VK_LAYER_NV_nsight-sys", // "VK_LAYER_NV_nsight-sys",
"VK_LAYER_GOOGLE_unique_objects", // "VK_LAYER_GOOGLE_unique_objects",
"VK_LAYER_GOOGLE_threading" // "VK_LAYER_GOOGLE_threading"
}; };
inst_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; 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; 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.sType =VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT;
create_info.pNext=nullptr; 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.flags =VK_DEBUG_REPORT_ERROR_BIT_EXT
create_info.pUserData=nullptr; |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); CreateDebugReportCallbackEXT(inst,&create_info,nullptr,&debug_report_callback);
} }
debug_messenger=VK_NULL_HANDLE; debug_messenger=VK_NULL_HANDLE;
{ {
VkDebugUtilsMessengerCreateInfoEXT createInfo={}; 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.sType =VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_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.pNext =nullptr;
createInfo.pfnUserCallback=debugCallback; 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); CreateDebugUtilsMessengerEXT(inst,&createInfo,nullptr,&debug_messenger);
} }