Merge branch 'develop' into 91-compute-first-network
# Conflicts: # include/vkcv/Core.hpp # projects/CMakeLists.txt
No related branches found
No related tags found
Showing
- .gitignore 5 additions, 0 deletions.gitignore
- .gitlab-ci.yml 41 additions, 5 deletions.gitlab-ci.yml
- .gitmodules 3 additions, 0 deletions.gitmodules
- CMakeLists.txt 2 additions, 1 deletionCMakeLists.txt
- config/Libraries.cmake 10 additions, 1 deletionconfig/Libraries.cmake
- config/Sources.cmake 3 additions, 0 deletionsconfig/Sources.cmake
- config/ext/IncludeShader.cmake 75 additions, 0 deletionsconfig/ext/IncludeShader.cmake
- config/lib/vma/vma.cpp 51 additions, 0 deletionsconfig/lib/vma/vma.cpp
- include/vkcv/Context.hpp 4 additions, 3 deletionsinclude/vkcv/Context.hpp
- include/vkcv/Core.hpp 36 additions, 16 deletionsinclude/vkcv/Core.hpp
- include/vkcv/DescriptorConfig.hpp 3 additions, 1 deletioninclude/vkcv/DescriptorConfig.hpp
- include/vkcv/DescriptorWrites.hpp 9 additions, 10 deletionsinclude/vkcv/DescriptorWrites.hpp
- include/vkcv/DrawcallRecording.hpp 33 additions, 7 deletionsinclude/vkcv/DrawcallRecording.hpp
- include/vkcv/Event.hpp 12 additions, 0 deletionsinclude/vkcv/Event.hpp
- include/vkcv/File.hpp 11 additions, 0 deletionsinclude/vkcv/File.hpp
- include/vkcv/QueueManager.hpp 2 additions, 2 deletionsinclude/vkcv/QueueManager.hpp
- include/vkcv/ShaderStage.hpp 5 additions, 1 deletioninclude/vkcv/ShaderStage.hpp
- lib/VulkanMemoryAllocator-Hpp 1 addition, 1 deletionlib/VulkanMemoryAllocator-Hpp
- modules/CMakeLists.txt 2 additions, 0 deletionsmodules/CMakeLists.txt
- modules/camera/config/GLM.cmake 9 additions, 7 deletionsmodules/camera/config/GLM.cmake
Loading
Please register or sign in to comment