Skip to content
Snippets Groups Projects
Commit b89e838e authored by Sebastian Gaida's avatar Sebastian Gaida
Browse files

Merge branch 'develop' into 16-swapchain-class - not stable, need to fix manually 

# Conflicts:
#	config/Sources.cmake
#	projects/first_triangle/src/main.cpp
#	src/vkcv/Context.cpp
#	src/vkcv/Context.hpp
#	src/vkcv/CoreManager.cpp
#	src/vkcv/CoreManager.hpp
#	src/vkcv/Window.cpp
parents 2cd085fb 74ff8e70
No related branches found
No related tags found
4 merge requests!12Resolve "Swapchain Class",!7Resolve "Shader Program Class",!5Resolve "Pipeline State Object",!4Resolve "Renderpass Class"
Hide whitespace changes
Inline Side-by-side
Showing
with 592 additions and 539 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment