Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 9c34e04

Browse files
LittleWhite-tbLittleWhite-tb
committed
Fixes my own mistakes
1 parent 6ea49c9 commit 9c34e04

4 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎fr/03_Dessiner_un_triangle/02_Pipeline_graphique_basique/03_Render_pass.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ces informations sont contenues dans un objet appelé *render pass*. Pour le con
99
```c++
1010
void initVulkan() {
1111
createInstance();
12-
setupDebugCallback();
12+
setupDebugMessenger();
1313
createSurface();
1414
pickPhysicalDevice();
1515
createLogicalDevice();
@@ -32,7 +32,7 @@ Dans notre cas nous aurons un seul attachement de couleur, et c'est une image de
3232

3333
```c++
3434
void createRenderPass() {
35-
VkAttachmentDescription colorAttachment = {};
35+
VkAttachmentDescription colorAttachment{};
3636
colorAttachment.format = swapChainImageFormat;
3737
colorAttachment.samples = VK_SAMPLE_COUNT_1_BIT;
3838
}

‎fr/03_Dessiner_un_triangle/02_Pipeline_graphique_basique/04_Conclusion.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ nous avons pu voir jusqu'à présent. Elle peut en effet accepter plusieurs stru
8383
et créer plusieurs `VkPipeline` en un seul appel.
8484

8585
Le second paramètre que nous n'utilisons pas ici (mais que nous reverrons dans un chapitre qui lui sera dédié) sert à
86-
fournir un objet `VkPipelineCache` Optionnel. Un tel objet peut être stocké et réutilisé entre plusieurs appels de la
86+
fournir un objet `VkPipelineCache` optionnel. Un tel objet peut être stocké et réutilisé entre plusieurs appels de la
8787
fonction et même entre plusieurs exécutions du programme si son contenu est correctement stocké dans un fichier. Cela
8888
permet de grandement accélérer la création des pipelines.
8989

‎fr/06_Texture_mapping/02_Sampler_d'image_combiné.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ transforment en un gradient.
150150

151151
```c++
152152
const std::vector<Vertex> vertices = {
153-
{{-0.5f, -0.5f}, {1.0f, 0.0f, 0.0f}, {1.0f, 0.0f}},
154-
{{0.5f, -0.5f}, {0.0f, 1.0f, 0.0f}, {0.0f, 0.0f}},
155-
{{0.5f, 0.5f}, {0.0f, 0.0f, 1.0f}, {0.0f, 1.0f}},
156-
{{-0.5f, 0.5f}, {1.0f, 1.0f, 1.0f}, {1.0f, 1.0f}}
153+
{{-0.5f, -0.5f}, {1.0f, 0.0f, 0.0f}, {0.0f, 0.0f}},
154+
{{0.5f, -0.5f}, {0.0f, 1.0f, 0.0f}, {1.0f, 0.0f}},
155+
{{0.5f, 0.5f}, {0.0f, 0.0f, 1.0f}, {1.0f, 1.0f}},
156+
{{-0.5f, 0.5f}, {1.0f, 1.0f, 1.0f}, {0.0f, 1.0f}}
157157
};
158158
```
159159

‎fr/09_Générer_des_mipmaps.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,21 +72,21 @@ Il nous faut aussi mettre à jour les appels.
7272
```c++
7373
createImage(swapChainExtent.width, swapChainExtent.height, 1, depthFormat, VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, depthImage, depthImageMemory);
7474
...
75-
createImage(texWidth, texHeight, mipLevels, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, textureImage, textureImageMemory);
75+
createImage(texWidth, texHeight, mipLevels, VK_FORMAT_R8G8B8A8_SRGB, VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, textureImage, textureImageMemory);
7676
```
7777

7878
```c++
7979
swapChainImageViews[i] = createImageView(swapChainImages[i], swapChainImageFormat, VK_IMAGE_ASPECT_COLOR_BIT, 1);
8080
...
8181
depthImageView = createImageView(depthImage, depthFormat, VK_IMAGE_ASPECT_DEPTH_BIT, 1);
8282
...
83-
textureImageView = createImageView(textureImage, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_ASPECT_COLOR_BIT, mipLevels);
83+
textureImageView = createImageView(textureImage, VK_FORMAT_R8G8B8A8_SRGB, VK_IMAGE_ASPECT_COLOR_BIT, mipLevels);
8484
```
8585

8686
```c++
8787
transitionImageLayout(depthImage, depthFormat, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL, 1);
8888
...
89-
transitionImageLayout(textureImage, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, mipLevels);
89+
transitionImageLayout(textureImage, VK_FORMAT_R8G8B8A8_SRGB, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, mipLevels);
9090
```
9191
9292
## Génération des mipmaps
@@ -102,7 +102,7 @@ création de l'image.
102102
103103
```c++
104104
...
105-
createImage(texWidth, texHeight, mipLevels, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, textureImage, textureImageMemory);
105+
createImage(texWidth, texHeight, mipLevels, VK_FORMAT_R8G8B8A8_SRGB, VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, textureImage, textureImageMemory);
106106
...
107107
```
108108

@@ -118,7 +118,7 @@ donc devoir écrire quelque commandes liées aux barrières de pipeline. Supprim
118118

119119
```c++
120120
...
121-
transitionImageLayout(textureImage, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, mipLevels);
121+
transitionImageLayout(textureImage, VK_FORMAT_R8G8B8A8_SRGB, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, mipLevels);
122122
copyBufferToImage(stagingBuffer, textureImage, static_cast<uint32_t>(texWidth), static_cast<uint32_t>(texHeight));
123123
//transitionné vers VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL lors de la generation des mipmaps
124124
...
@@ -132,7 +132,7 @@ Nous allons maintenant écrire la fonction qui génèrera les mipmaps.
132132
```c++
133133
void generateMipmaps(VkImage image, int32_t texWidth, int32_t texHeight, uint32_t mipLevels) {
134134
VkCommandBuffer commandBuffer = beginSingleTimeCommands();
135-
135+
136136
VkImageMemoryBarrier barrier{};
137137
barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
138138
barrier.image = image;
@@ -142,7 +142,7 @@ void generateMipmaps(VkImage image, int32_t texWidth, int32_t texHeight, uint32_
142142
barrier.subresourceRange.baseArrayLayer = 0;
143143
barrier.subresourceRange.layerCount = 1;
144144
barrier.subresourceRange.levelCount = 1;
145-
145+
146146
endSingleTimeCommands(commandBuffer);
147147
}
148148
```
@@ -266,7 +266,7 @@ n'a jamais servie de source à une copie.
266266
Appelez finalement cette fonction depuis `createTextureImage` :
267267
268268
```c++
269-
transitionImageLayout(textureImage, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, mipLevels);
269+
transitionImageLayout(textureImage, VK_FORMAT_R8G8B8A8_SRGB, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, mipLevels);
270270
copyBufferToImage(stagingBuffer, textureImage, static_cast<uint32_t>(texWidth), static_cast<uint32_t>(texHeight));
271271
//transions vers VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL pendant la génération des mipmaps
272272
...
@@ -287,7 +287,7 @@ Ajoutez d'abord un paramètre qui indique le format de l'image :
287287
void createTextureImage() {
288288
...
289289

290-
generateMipmaps(textureImage, VK_FORMAT_R8G8B8A8_UNORM, texWidth, texHeight, mipLevels);
290+
generateMipmaps(textureImage, VK_FORMAT_R8G8B8A8_SRGB, texWidth, texHeight, mipLevels);
291291
}
292292

293293
void generateMipmaps(VkImage image, VkFormat imageFormat, int32_t texWidth, int32_t texHeight, uint32_t mipLevels) {

0 commit comments

Comments
 (0)