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

Merge branch 'develop' into 105-indirect-draw 

# Conflicts:
#	src/vkcv/Context.cpp
#	src/vkcv/Core.cpp
#	src/vkcv/DescriptorManager.cpp
parents 4783c397 b343d4ab
No related branches found
No related tags found
1 merge request!88Resolve "Indirect Draw"
Hide whitespace changes
Inline Side-by-side
Showing
with 359 additions and 206 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment