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

42123b1c

Commit 42123b1c authored 3 years ago by Sebastian Gaida

Downloads
- Plain Diff

Merge branch 'develop' into 89-mehrere-fenster-abhangigkeiten-von-core-zu-fenster-swapchain-etc

parents fb55e5cd d5765a0e

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

include/vkcv/DescriptorConfig.hpp 2 additions, 4 deletions

include/vkcv/DescriptorConfig.hpp
include/vkcv/ShaderProgram.hpp 1 addition, 1 deletion

include/vkcv/ShaderProgram.hpp
include/vkcv/ShaderStage.hpp 34 additions, 14 deletions

include/vkcv/ShaderStage.hpp
modules/shader_compiler/CMakeLists.txt 1 addition, 1 deletion

modules/shader_compiler/CMakeLists.txt
src/vkcv/DescriptorConfig.cpp 2 additions, 2 deletions

src/vkcv/DescriptorConfig.cpp
src/vkcv/DescriptorManager.cpp 1 addition, 21 deletions

src/vkcv/DescriptorManager.cpp
src/vkcv/DescriptorManager.hpp 0 additions, 6 deletions

src/vkcv/DescriptorManager.hpp
src/vkcv/ShaderProgram.cpp 19 additions, 1 deletion

src/vkcv/ShaderProgram.cpp

with 60 additions and 50 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