Merge branch 'develop' into 87-mesh-shader-implementation
# Conflicts: # config/lib/vma/vma.cpp # include/vkcv/DrawcallRecording.hpp # lib/VulkanMemoryAllocator-Hpp # modules/scene/CMakeLists.txt # projects/CMakeLists.txt # src/vkcv/Context.cpp # src/vkcv/Core.cpp # src/vkcv/DrawcallRecording.cpp # src/vkcv/PipelineManager.cpp
No related branches found
No related tags found
Checking pipeline status
Showing
- config/lib/vma/vma.cpp 51 additions, 0 deletionsconfig/lib/vma/vma.cpp
- include/vkcv/DrawcallRecording.hpp 1 addition, 1 deletioninclude/vkcv/DrawcallRecording.hpp
- include/vkcv/Event.hpp 10 additions, 0 deletionsinclude/vkcv/Event.hpp
- lib/VulkanMemoryAllocator-Hpp 1 addition, 1 deletionlib/VulkanMemoryAllocator-Hpp
- modules/camera/config/GLM.cmake 9 additions, 7 deletionsmodules/camera/config/GLM.cmake
- modules/scene/CMakeLists.txt 1 addition, 1 deletionmodules/scene/CMakeLists.txt
- src/vkcv/DrawcallRecording.cpp 0 additions, 1 deletionsrc/vkcv/DrawcallRecording.cpp
- src/vkcv/PipelineManager.cpp 3 additions, 3 deletionssrc/vkcv/PipelineManager.cpp
Loading
Please register or sign in to comment