Skip to content
Snippets Groups Projects

Resolve "Shader Program Class"

Merged Resolve "Shader Program Class"
10-shader-program-class into develop
5 unresolved threads
Merged Mark Oliver Mints requested to merge 10-shader-program-class into develop
5 unresolved threads
Compare
and
9 files
+ 244
− 0
Compare changes
  • Side-by-side
  • Inline
Files
9
config/Sources.cmake
+ 7
− 0
@@ -12,4 +12,11 @@ set(vkcv_sources
${vkcv_include}/vkcv/Window.hpp
${vkcv_source}/vkcv/Window.cpp
<<<<<<< HEAD
${vkcv_source}/vkcv/CoreManager.hpp
${vkcv_source}/vkcv/CoreManager.cpp
${vkcv_source}/vkcv/ShaderProgram.hpp
${vkcv_source}/vkcv/ShaderProgram.cpp
=======
>>>>>>> 74ff8e7041d7958006a434cf4d3a7fee0a3fa724
)