Skip to content

Commit 95a5c19

Browse files
committed
improve
1 parent 0601cd2 commit 95a5c19

File tree

39 files changed

+123
-123
lines changed

39 files changed

+123
-123
lines changed

docs/codes/00/01_env/CMakePresets.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
{
2-
"version": 8,
3-
"cmakeMinimumRequired": {
4-
"major": 3,
5-
"minor": 30,
6-
"patch": 0
7-
},
2+
"version": 6,
83
"configurePresets": [
94
{
105
"name": "ninja-base",
@@ -67,6 +62,7 @@
6762
"description": "Linux/macOS Clang Debug config presets(Clang + Ninja)",
6863
"inherits": "ninja-base",
6964
"cacheVariables": {
65+
"CMAKE_CXX_FLAGS": "-stdlib=libc++",
7066
"CMAKE_BUILD_TYPE": "Debug",
7167
"CMAKE_CXX_COMPILER": "clang++",
7268
"CMAKE_C_COMPILER": "clang"
@@ -77,6 +73,7 @@
7773
"description": "Linux/macOS Clang Release config presets(Clang + Ninja)",
7874
"inherits": "ninja-base",
7975
"cacheVariables": {
76+
"CMAKE_CXX_FLAGS": "-stdlib=libc++",
8077
"CMAKE_BUILD_TYPE": "Release",
8178
"CMAKE_CXX_COMPILER": "clang++",
8279
"CMAKE_C_COMPILER": "clang"

docs/codes/02/30_texture/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,7 +1112,7 @@ class HelloTriangleApplication {
11121112
uint32_t width,
11131113
uint32_t height,
11141114
vk::Format format,
1115-
vk::ImageTiling tilling,
1115+
vk::ImageTiling tiling,
11161116
vk::ImageUsageFlags usage,
11171117
vk::MemoryPropertyFlags properties,
11181118
vk::raii::Image& image,
@@ -1126,7 +1126,7 @@ class HelloTriangleApplication {
11261126
imageInfo.mipLevels = 1;
11271127
imageInfo.arrayLayers = 1;
11281128
imageInfo.format = format;
1129-
imageInfo.tiling = tilling;
1129+
imageInfo.tiling = tiling;
11301130
imageInfo.initialLayout = vk::ImageLayout::eUndefined;
11311131
imageInfo.usage = usage;
11321132
imageInfo.samples = vk::SampleCountFlagBits::e1;

docs/codes/02/30_texture/main.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ index 2e9de97..7feb5bb 100644
100100
+ uint32_t width,
101101
+ uint32_t height,
102102
+ vk::Format format,
103-
+ vk::ImageTiling tilling,
103+
+ vk::ImageTiling tiling,
104104
+ vk::ImageUsageFlags usage,
105105
+ vk::MemoryPropertyFlags properties,
106106
+ vk::raii::Image& image,
@@ -114,7 +114,7 @@ index 2e9de97..7feb5bb 100644
114114
+ imageInfo.mipLevels = 1;
115115
+ imageInfo.arrayLayers = 1;
116116
+ imageInfo.format = format;
117-
+ imageInfo.tiling = tilling;
117+
+ imageInfo.tiling = tiling;
118118
+ imageInfo.initialLayout = vk::ImageLayout::eUndefined;
119119
+ imageInfo.usage = usage;
120120
+ imageInfo.samples = vk::SampleCountFlagBits::e1;

docs/codes/02/31_sampler/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1109,7 +1109,7 @@ class HelloTriangleApplication {
11091109
uint32_t width,
11101110
uint32_t height,
11111111
vk::Format format,
1112-
vk::ImageTiling tilling,
1112+
vk::ImageTiling tiling,
11131113
vk::ImageUsageFlags usage,
11141114
vk::MemoryPropertyFlags properties,
11151115
vk::raii::Image& image,
@@ -1123,7 +1123,7 @@ class HelloTriangleApplication {
11231123
imageInfo.mipLevels = 1;
11241124
imageInfo.arrayLayers = 1;
11251125
imageInfo.format = format;
1126-
imageInfo.tiling = tilling;
1126+
imageInfo.tiling = tiling;
11271127
imageInfo.initialLayout = vk::ImageLayout::eUndefined;
11281128
imageInfo.usage = usage;
11291129
imageInfo.samples = vk::SampleCountFlagBits::e1;

docs/codes/02/32_combined/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,7 +1135,7 @@ class HelloTriangleApplication {
11351135
uint32_t width,
11361136
uint32_t height,
11371137
vk::Format format,
1138-
vk::ImageTiling tilling,
1138+
vk::ImageTiling tiling,
11391139
vk::ImageUsageFlags usage,
11401140
vk::MemoryPropertyFlags properties,
11411141
vk::raii::Image& image,
@@ -1149,7 +1149,7 @@ class HelloTriangleApplication {
11491149
imageInfo.mipLevels = 1;
11501150
imageInfo.arrayLayers = 1;
11511151
imageInfo.format = format;
1152-
imageInfo.tiling = tilling;
1152+
imageInfo.tiling = tiling;
11531153
imageInfo.initialLayout = vk::ImageLayout::eUndefined;
11541154
imageInfo.usage = usage;
11551155
imageInfo.samples = vk::SampleCountFlagBits::e1;

docs/codes/02/40_depthbuffer/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,7 +1182,7 @@ class HelloTriangleApplication {
11821182
uint32_t width,
11831183
uint32_t height,
11841184
vk::Format format,
1185-
vk::ImageTiling tilling,
1185+
vk::ImageTiling tiling,
11861186
vk::ImageUsageFlags usage,
11871187
vk::MemoryPropertyFlags properties,
11881188
vk::raii::Image& image,
@@ -1196,7 +1196,7 @@ class HelloTriangleApplication {
11961196
imageInfo.mipLevels = 1;
11971197
imageInfo.arrayLayers = 1;
11981198
imageInfo.format = format;
1199-
imageInfo.tiling = tilling;
1199+
imageInfo.tiling = tiling;
12001200
imageInfo.initialLayout = vk::ImageLayout::eUndefined;
12011201
imageInfo.usage = usage;
12021202
imageInfo.samples = vk::SampleCountFlagBits::e1;

docs/codes/03/00_loadmodel/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,7 +1183,7 @@ class HelloTriangleApplication {
11831183
uint32_t width,
11841184
uint32_t height,
11851185
vk::Format format,
1186-
vk::ImageTiling tilling,
1186+
vk::ImageTiling tiling,
11871187
vk::ImageUsageFlags usage,
11881188
vk::MemoryPropertyFlags properties,
11891189
vk::raii::Image& image,
@@ -1197,7 +1197,7 @@ class HelloTriangleApplication {
11971197
imageInfo.mipLevels = 1;
11981198
imageInfo.arrayLayers = 1;
11991199
imageInfo.format = format;
1200-
imageInfo.tiling = tilling;
1200+
imageInfo.tiling = tiling;
12011201
imageInfo.initialLayout = vk::ImageLayout::eUndefined;
12021202
imageInfo.usage = usage;
12031203
imageInfo.samples = vk::SampleCountFlagBits::e1;

docs/codes/03/10_movecamera/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1197,7 +1197,7 @@ class HelloTriangleApplication {
11971197
uint32_t width,
11981198
uint32_t height,
11991199
vk::Format format,
1200-
vk::ImageTiling tilling,
1200+
vk::ImageTiling tiling,
12011201
vk::ImageUsageFlags usage,
12021202
vk::MemoryPropertyFlags properties,
12031203
vk::raii::Image& image,
@@ -1211,7 +1211,7 @@ class HelloTriangleApplication {
12111211
imageInfo.mipLevels = 1;
12121212
imageInfo.arrayLayers = 1;
12131213
imageInfo.format = format;
1214-
imageInfo.tiling = tilling;
1214+
imageInfo.tiling = tiling;
12151215
imageInfo.initialLayout = vk::ImageLayout::eUndefined;
12161216
imageInfo.usage = usage;
12171217
imageInfo.samples = vk::SampleCountFlagBits::e1;

docs/codes/03/20_mipmaps/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,7 +1204,7 @@ class HelloTriangleApplication {
12041204
uint32_t height,
12051205
uint32_t mipLevels,
12061206
vk::Format format,
1207-
vk::ImageTiling tilling,
1207+
vk::ImageTiling tiling,
12081208
vk::ImageUsageFlags usage,
12091209
vk::MemoryPropertyFlags properties,
12101210
vk::raii::Image& image,
@@ -1218,7 +1218,7 @@ class HelloTriangleApplication {
12181218
imageInfo.mipLevels = mipLevels;
12191219
imageInfo.arrayLayers = 1;
12201220
imageInfo.format = format;
1221-
imageInfo.tiling = tilling;
1221+
imageInfo.tiling = tiling;
12221222
imageInfo.initialLayout = vk::ImageLayout::eUndefined;
12231223
imageInfo.usage = usage;
12241224
imageInfo.samples = vk::SampleCountFlagBits::e1;

docs/codes/03/20_mipmaps/main.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ index 4ec3b5f..46c75ca 100644
3030
uint32_t height,
3131
+ uint32_t mipLevels,
3232
vk::Format format,
33-
vk::ImageTiling tilling,
33+
vk::ImageTiling tiling,
3434
vk::ImageUsageFlags usage,
3535
@@ -1208,7 +1215,7 @@ private:
3636
imageInfo.extent.width = width;
@@ -40,7 +40,7 @@ index 4ec3b5f..46c75ca 100644
4040
+ imageInfo.mipLevels = mipLevels;
4141
imageInfo.arrayLayers = 1;
4242
imageInfo.format = format;
43-
imageInfo.tiling = tilling;
43+
imageInfo.tiling = tiling;
4444
@@ -1232,7 +1239,8 @@ private:
4545
vk::raii::Image& image,
4646
vk::Format format,

0 commit comments

Comments
 (0)