Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

VkCV Framework
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

7ae0c95d

Commit 7ae0c95d authored 3 years ago by Alexander Gauggel

Downloads
- Plain Diff

[#87] Resolve merge conflicts

parents 40f4700c 25fdb8d3

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 47
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/vkcv/Core.cpp 107 additions, 19 deletions

src/vkcv/Core.cpp
src/vkcv/DescriptorManager.cpp 30 additions, 9 deletions

src/vkcv/DescriptorManager.cpp
src/vkcv/File.cpp 60 additions, 0 deletions

src/vkcv/File.cpp
src/vkcv/ImageManager.hpp 2 additions, 0 deletions

src/vkcv/ImageManager.hpp
src/vkcv/QueueManager.cpp 2 additions, 2 deletions

src/vkcv/QueueManager.cpp
src/vkcv/SamplerManager.cpp 5 additions, 4 deletions

src/vkcv/SamplerManager.cpp
src/vkcv/SamplerManager.hpp 2 additions, 1 deletion

src/vkcv/SamplerManager.hpp

with 208 additions and 35 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment