Merge branch 'develop' into 89-mehrere-fenster-abhangigkeiten-von-core-zu-fenster-swapchain-etc
# Conflicts: # src/vkcv/Core.cpp
No related branches found
No related tags found
Showing
- include/vkcv/Core.hpp 12 additions, 2 deletionsinclude/vkcv/Core.hpp
- include/vkcv/DescriptorConfig.hpp 52 additions, 12 deletionsinclude/vkcv/DescriptorConfig.hpp
- include/vkcv/Handles.hpp 6 additions, 0 deletionsinclude/vkcv/Handles.hpp
- include/vkcv/ShaderProgram.hpp 8 additions, 2 deletionsinclude/vkcv/ShaderProgram.hpp
- modules/material/include/vkcv/material/Material.hpp 5 additions, 1 deletionmodules/material/include/vkcv/material/Material.hpp
- modules/material/src/vkcv/material/Material.cpp 21 additions, 15 deletionsmodules/material/src/vkcv/material/Material.cpp
- modules/upscaling/include/vkcv/upscaling/FSRUpscaling.hpp 4 additions, 1 deletionmodules/upscaling/include/vkcv/upscaling/FSRUpscaling.hpp
- modules/upscaling/src/vkcv/upscaling/FSRUpscaling.cpp 47 additions, 23 deletionsmodules/upscaling/src/vkcv/upscaling/FSRUpscaling.cpp
- projects/first_mesh/src/main.cpp 11 additions, 4 deletionsprojects/first_mesh/src/main.cpp
- projects/first_scene/src/main.cpp 3 additions, 3 deletionsprojects/first_scene/src/main.cpp
- projects/indirect_dispatch/src/AppSetup.cpp 10 additions, 8 deletionsprojects/indirect_dispatch/src/AppSetup.cpp
- projects/indirect_dispatch/src/AppSetup.hpp 7 additions, 5 deletionsprojects/indirect_dispatch/src/AppSetup.hpp
- projects/mesh_shader/src/main.cpp 6 additions, 5 deletionsprojects/mesh_shader/src/main.cpp
- projects/particle_simulation/src/BloomAndFlares.cpp 15 additions, 8 deletionsprojects/particle_simulation/src/BloomAndFlares.cpp
- projects/particle_simulation/src/BloomAndFlares.hpp 12 additions, 8 deletionsprojects/particle_simulation/src/BloomAndFlares.hpp
- projects/particle_simulation/src/main.cpp 10 additions, 7 deletionsprojects/particle_simulation/src/main.cpp
- projects/voxelization/src/BloomAndFlares.cpp 19 additions, 10 deletionsprojects/voxelization/src/BloomAndFlares.cpp
- projects/voxelization/src/BloomAndFlares.hpp 15 additions, 9 deletionsprojects/voxelization/src/BloomAndFlares.hpp
- projects/voxelization/src/ShadowMapping.cpp 11 additions, 8 deletionsprojects/voxelization/src/ShadowMapping.cpp
- projects/voxelization/src/ShadowMapping.hpp 20 additions, 17 deletionsprojects/voxelization/src/ShadowMapping.hpp
Loading
Please register or sign in to comment