src/vkcv/DrawcallRecording.cpp · 86f6f534ea12a8b21fea118909bc82015e8bb8d1 · Vulkan2021 / VkCV Framework

3 years ago

Merge branch 'develop' into 87-mesh-shader-implementation · e4952916

Sebastian Gaida authored 3 years ago

# 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

e4952916

History

Merge branch 'develop' into 87-mesh-shader-implementation

Sebastian Gaida authored 3 years ago

# 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

DrawcallRecording.cpp 4.01 KiB