Commit f285d58
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.cppFile tree
31 files changed
+23567
-24870
lines changed- antora/modules/ROOT
- attachments
- en
- 03_Drawing_a_triangle
- 00_Setup
- 03_Drawing
- 06_Texture_mapping
31 files changed
+23567
-24870
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
| 65 | + | |
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
0 commit comments