Skip to content

Commit 5dad59f

Browse files
committed
Add Multi-Subpass
1 parent 5a7e535 commit 5dad59f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+34238
-182
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
/shaders export-ignore
88
/textures export-ignore
99
/src export-ignore
10+
/cmake export-ignore
1011
/CMakeLists.txt export-ignore
1112
/CMakePresets.json export-ignore

docs/codes/02/21_descriptor2/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ class HelloTriangleApplication {
988988

989989
/////////////////////////////////////////////////////////////////
990990
/// descriptor layout and buffer
991-
struct alignas(16) UniformBufferObject {
991+
struct UniformBufferObject {
992992
glm::mat4 model;
993993
glm::mat4 view;
994994
glm::mat4 proj;

docs/codes/02/21_descriptor2/main.diff

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,6 @@ index 42439f0..2e9de97 100644
5252
commandBuffer.drawIndexed(static_cast<uint32_t>(indices.size()), 1, 0, 0, 0);
5353

5454
commandBuffer.endRenderPass();
55-
@@ -975,7 +988,7 @@ private:
56-
57-
/////////////////////////////////////////////////////////////////
58-
/// descriptor layout and buffer
59-
- struct UniformBufferObject {
60-
+ struct alignas(16) UniformBufferObject {
61-
glm::mat4 model;
62-
glm::mat4 view;
63-
glm::mat4 proj;
6455
@@ -1043,6 +1056,45 @@ private:
6556
memcpy(m_uniformBuffersMapped[currentImage], &ubo, sizeof(ubo));
6657
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -973,7 +973,7 @@ class HelloTriangleApplication {
973973

974974
/////////////////////////////////////////////////////////////////
975975
/// descriptor layout and buffer
976-
struct alignas(16) UniformBufferObject {
976+
struct UniformBufferObject {
977977
glm::mat4 model;
978978
glm::mat4 view;
979979
glm::mat4 proj;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,7 @@ class HelloTriangleApplication {
970970

971971
/////////////////////////////////////////////////////////////////
972972
/// descriptor layout and buffer
973-
struct alignas(16) UniformBufferObject {
973+
struct UniformBufferObject {
974974
glm::mat4 model;
975975
glm::mat4 view;
976976
glm::mat4 proj;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,7 @@ class HelloTriangleApplication {
976976

977977
/////////////////////////////////////////////////////////////////
978978
/// descriptor layout and buffer
979-
struct alignas(16) UniformBufferObject {
979+
struct UniformBufferObject {
980980
glm::mat4 model;
981981
glm::mat4 view;
982982
glm::mat4 proj;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,7 @@ class HelloTriangleApplication {
10231023

10241024
/////////////////////////////////////////////////////////////////
10251025
/// descriptor layout and buffer
1026-
struct alignas(16) UniformBufferObject {
1026+
struct UniformBufferObject {
10271027
glm::mat4 model;
10281028
glm::mat4 view;
10291029
glm::mat4 proj;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1024,7 +1024,7 @@ class HelloTriangleApplication {
10241024

10251025
/////////////////////////////////////////////////////////////////
10261026
/// descriptor layout and buffer
1027-
struct alignas(16) UniformBufferObject {
1027+
struct UniformBufferObject {
10281028
glm::mat4 model;
10291029
glm::mat4 view;
10301030
glm::mat4 proj;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1030,7 +1030,7 @@ class HelloTriangleApplication {
10301030

10311031
/////////////////////////////////////////////////////////////////
10321032
/// descriptor layout and buffer
1033-
struct alignas(16) UniformBufferObject {
1033+
struct UniformBufferObject {
10341034
glm::mat4 model;
10351035
glm::mat4 view;
10361036
glm::mat4 proj;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1036,7 +1036,7 @@ class HelloTriangleApplication {
10361036

10371037
/////////////////////////////////////////////////////////////////
10381038
/// descriptor layout and buffer
1039-
struct alignas(16) UniformBufferObject {
1039+
struct UniformBufferObject {
10401040
glm::mat4 model;
10411041
glm::mat4 view;
10421042
glm::mat4 proj;

0 commit comments

Comments
 (0)