Skip to content

Commit f285d58

Browse files
committed
Merge branch 'main' into clang_format
# Conflicts: # attachments/15_hello_triangle.cpp # attachments/16_frames_in_flight.cpp # attachments/17_swap_chain_recreation.cpp # attachments/18_vertex_input.cpp # attachments/19_vertex_buffer.cpp # attachments/20_staging_buffer.cpp # attachments/21_index_buffer.cpp # attachments/22_descriptor_layout.cpp # attachments/23_descriptor_sets.cpp # attachments/24_texture_image.cpp # attachments/25_sampler.cpp # attachments/26_texture_mapping.cpp # attachments/27_depth_buffering.cpp # attachments/28_model_loading.cpp # attachments/29_mipmapping.cpp # attachments/30_multisampling.cpp # attachments/31_compute_shader.cpp # attachments/32_ecosystem_utilities.cpp # attachments/33_vulkan_profiles.cpp # attachments/35_gltf_ktx.cpp # attachments/36_multiple_objects.cpp # attachments/37_multithreading.cpp # attachments/38_ray_tracing.cpp
2 parents d43941f + 994c895 commit f285d58

31 files changed

+23567
-24870
lines changed

antora/modules/ROOT/nav.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,4 @@
6262
** xref:courses/18_Ray_tracing/06_Reflections.adoc[Reflections]
6363
** xref:courses/18_Ray_tracing/07_Conclusion.adoc[Conclusion]
6464
* xref:90_FAQ.adoc[FAQ]
65+
* link:https://github.com/KhronosGroup/Vulkan-Tutorial[GitHub Repository, window=_blank]

attachments/15_hello_triangle.cpp

Lines changed: 546 additions & 567 deletions
Large diffs are not rendered by default.

attachments/16_frames_in_flight.cpp

Lines changed: 563 additions & 583 deletions
Large diffs are not rendered by default.

attachments/17_swap_chain_recreation.cpp

Lines changed: 609 additions & 641 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)