[#87] merge develope and fixed conflicts
parent
55937807
No related branches found
No related tags found
Showing
- .gitmodules 6 additions, 0 deletions.gitmodules
- config/Libraries.cmake 1 addition, 0 deletionsconfig/Libraries.cmake
- config/Sources.cmake 5 additions, 0 deletionsconfig/Sources.cmake
- config/lib/GLFW.cmake 1 addition, 0 deletionsconfig/lib/GLFW.cmake
- config/lib/SPIRV_Cross.cmake 1 addition, 0 deletionsconfig/lib/SPIRV_Cross.cmake
- config/lib/VulkanMemoryAllocator.cmake 22 additions, 0 deletionsconfig/lib/VulkanMemoryAllocator.cmake
- config/lib/vma/CMakeLists.txt 59 additions, 0 deletionsconfig/lib/vma/CMakeLists.txt
- config/lib/vma/vma.cpp 7 additions, 0 deletionsconfig/lib/vma/vma.cpp
- include/vkcv/BufferManager.hpp 2 additions, 2 deletionsinclude/vkcv/BufferManager.hpp
- include/vkcv/Context.hpp 8 additions, 1 deletioninclude/vkcv/Context.hpp
- include/vkcv/Core.hpp 18 additions, 13 deletionsinclude/vkcv/Core.hpp
- include/vkcv/DescriptorConfig.hpp 1 addition, 0 deletionsinclude/vkcv/DescriptorConfig.hpp
- include/vkcv/DrawcallRecording.hpp 6 additions, 11 deletionsinclude/vkcv/DrawcallRecording.hpp
- include/vkcv/Image.hpp 16 additions, 15 deletionsinclude/vkcv/Image.hpp
- include/vkcv/ImageConfig.hpp 9 additions, 0 deletionsinclude/vkcv/ImageConfig.hpp
- include/vkcv/Logger.hpp 30 additions, 18 deletionsinclude/vkcv/Logger.hpp
- include/vkcv/PassConfig.hpp 3 additions, 1 deletioninclude/vkcv/PassConfig.hpp
- include/vkcv/PipelineConfig.hpp 23 additions, 9 deletionsinclude/vkcv/PipelineConfig.hpp
- include/vkcv/PushConstants.hpp 93 additions, 0 deletionsinclude/vkcv/PushConstants.hpp
- include/vkcv/Swapchain.hpp 4 additions, 0 deletionsinclude/vkcv/Swapchain.hpp
Loading
Please register or sign in to comment