diff --git a/base/vulkanexamplebase.h b/base/vulkanexamplebase.h index 938e2850..57fbc3d6 100644 --- a/base/vulkanexamplebase.h +++ b/base/vulkanexamplebase.h @@ -29,14 +29,27 @@ #include #endif +#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include +#include #include #define GLM_FORCE_RADIANS #define GLM_FORCE_DEPTH_ZERO_TO_ONE #define GLM_ENABLE_EXPERIMENTAL #include +#include +#include +#include #include #include #include diff --git a/examples/bloom/bloom.cpp b/examples/bloom/bloom.cpp index e790f60a..11b49dc0 100644 --- a/examples/bloom/bloom.cpp +++ b/examples/bloom/bloom.cpp @@ -6,18 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/computecloth/computecloth.cpp b/examples/computecloth/computecloth.cpp index 1e346995..22d769d1 100644 --- a/examples/computecloth/computecloth.cpp +++ b/examples/computecloth/computecloth.cpp @@ -6,19 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/computecullandlod/computecullandlod.cpp b/examples/computecullandlod/computecullandlod.cpp index b18f811f..a55904a4 100644 --- a/examples/computecullandlod/computecullandlod.cpp +++ b/examples/computecullandlod/computecullandlod.cpp @@ -7,20 +7,6 @@ * */ -#include -#include -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" #include "frustum.hpp" diff --git a/examples/computenbody/computenbody.cpp b/examples/computenbody/computenbody.cpp index f0118312..84d1c278 100644 --- a/examples/computenbody/computenbody.cpp +++ b/examples/computenbody/computenbody.cpp @@ -6,19 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #define VERTEX_BUFFER_BIND_ID 0 diff --git a/examples/computeparticles/computeparticles.cpp b/examples/computeparticles/computeparticles.cpp index 3cbcb808..bdfc49e4 100644 --- a/examples/computeparticles/computeparticles.cpp +++ b/examples/computeparticles/computeparticles.cpp @@ -8,19 +8,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #define VERTEX_BUFFER_BIND_ID 0 diff --git a/examples/computeraytracing/computeraytracing.cpp b/examples/computeraytracing/computeraytracing.cpp index 8ccbe828..f99893bc 100644 --- a/examples/computeraytracing/computeraytracing.cpp +++ b/examples/computeraytracing/computeraytracing.cpp @@ -6,18 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #define VERTEX_BUFFER_BIND_ID 0 diff --git a/examples/computeshader/computeshader.cpp b/examples/computeshader/computeshader.cpp index a55876ef..630a76e2 100644 --- a/examples/computeshader/computeshader.cpp +++ b/examples/computeshader/computeshader.cpp @@ -6,18 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #define VERTEX_BUFFER_BIND_ID 0 diff --git a/examples/conditionalrender/conditionalrender.cpp b/examples/conditionalrender/conditionalrender.cpp index be351d61..5a888eca 100644 --- a/examples/conditionalrender/conditionalrender.cpp +++ b/examples/conditionalrender/conditionalrender.cpp @@ -11,18 +11,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/conservativeraster/conservativeraster.cpp b/examples/conservativeraster/conservativeraster.cpp index e6292b9c..20e76ce7 100644 --- a/examples/conservativeraster/conservativeraster.cpp +++ b/examples/conservativeraster/conservativeraster.cpp @@ -10,18 +10,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #define ENABLE_VALIDATION false diff --git a/examples/debugmarker/debugmarker.cpp b/examples/debugmarker/debugmarker.cpp index 6d065034..5f69c841 100644 --- a/examples/debugmarker/debugmarker.cpp +++ b/examples/debugmarker/debugmarker.cpp @@ -12,18 +12,6 @@ * https://github.com/KhronosGroup/Vulkan-Samples/blob/master/samples/extensions/debug_utils. */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/deferred/deferred.cpp b/examples/deferred/deferred.cpp index 6fb361ff..c62ee304 100644 --- a/examples/deferred/deferred.cpp +++ b/examples/deferred/deferred.cpp @@ -6,18 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/deferredmultisampling/deferredmultisampling.cpp b/examples/deferredmultisampling/deferredmultisampling.cpp index eb36d13a..3f98b30f 100644 --- a/examples/deferredmultisampling/deferredmultisampling.cpp +++ b/examples/deferredmultisampling/deferredmultisampling.cpp @@ -6,18 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanFrameBuffer.hpp" #include "VulkanglTFModel.h" diff --git a/examples/deferredshadows/deferredshadows.cpp b/examples/deferredshadows/deferredshadows.cpp index bd22cd39..c387bf21 100644 --- a/examples/deferredshadows/deferredshadows.cpp +++ b/examples/deferredshadows/deferredshadows.cpp @@ -6,19 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanFrameBuffer.hpp" #include "VulkanglTFModel.h" diff --git a/examples/descriptorindexing/descriptorindexing.cpp b/examples/descriptorindexing/descriptorindexing.cpp index 409ab2e9..a27c52fd 100644 --- a/examples/descriptorindexing/descriptorindexing.cpp +++ b/examples/descriptorindexing/descriptorindexing.cpp @@ -8,20 +8,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #define ENABLE_VALIDATION false diff --git a/examples/descriptorsets/descriptorsets.cpp b/examples/descriptorsets/descriptorsets.cpp index 7e6002c7..255bf7b3 100644 --- a/examples/descriptorsets/descriptorsets.cpp +++ b/examples/descriptorsets/descriptorsets.cpp @@ -8,19 +8,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/displacement/displacement.cpp b/examples/displacement/displacement.cpp index 840aeaa1..3ab093a2 100644 --- a/examples/displacement/displacement.cpp +++ b/examples/displacement/displacement.cpp @@ -6,18 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/distancefieldfonts/distancefieldfonts.cpp b/examples/distancefieldfonts/distancefieldfonts.cpp index 4ae44b3d..eac15676 100644 --- a/examples/distancefieldfonts/distancefieldfonts.cpp +++ b/examples/distancefieldfonts/distancefieldfonts.cpp @@ -8,20 +8,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #define VERTEX_BUFFER_BIND_ID 0 diff --git a/examples/dynamicuniformbuffer/dynamicuniformbuffer.cpp b/examples/dynamicuniformbuffer/dynamicuniformbuffer.cpp index 1a2a80c4..1ac90c20 100644 --- a/examples/dynamicuniformbuffer/dynamicuniformbuffer.cpp +++ b/examples/dynamicuniformbuffer/dynamicuniformbuffer.cpp @@ -16,20 +16,6 @@ * offset used to pass data from the single uniform buffer to the connected shader binding point. */ -#include -#include -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #define VERTEX_BUFFER_BIND_ID 0 diff --git a/examples/gears/gears.cpp b/examples/gears/gears.cpp index 64f9d7ae..f01172b9 100644 --- a/examples/gears/gears.cpp +++ b/examples/gears/gears.cpp @@ -6,18 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkangear.h" #include "vulkanexamplebase.h" diff --git a/examples/geometryshader/geometryshader.cpp b/examples/geometryshader/geometryshader.cpp index 06771c04..5fabe60e 100644 --- a/examples/geometryshader/geometryshader.cpp +++ b/examples/geometryshader/geometryshader.cpp @@ -6,18 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/gltfloading/gltfloading.cpp b/examples/gltfloading/gltfloading.cpp index 82fbc58a..2dca1c71 100644 --- a/examples/gltfloading/gltfloading.cpp +++ b/examples/gltfloading/gltfloading.cpp @@ -17,18 +17,6 @@ * If you are looking for a complete glTF implementation, check out https://github.com/SaschaWillems/Vulkan-glTF-PBR/ */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include -#include - #define TINYGLTF_IMPLEMENTATION #define STB_IMAGE_IMPLEMENTATION #define TINYGLTF_NO_STB_IMAGE_WRITE @@ -37,7 +25,6 @@ #endif #include "tiny_gltf.h" -#include #include "vulkanexamplebase.h" #define ENABLE_VALIDATION false diff --git a/examples/gltfscenerendering/gltfscenerendering.h b/examples/gltfscenerendering/gltfscenerendering.h index bfee3629..591237aa 100644 --- a/examples/gltfscenerendering/gltfscenerendering.h +++ b/examples/gltfscenerendering/gltfscenerendering.h @@ -12,18 +12,6 @@ * This sample comes with a tutorial, see the README.md in this folder */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include -#include - #define TINYGLTF_IMPLEMENTATION #define STB_IMAGE_IMPLEMENTATION #define TINYGLTF_NO_STB_IMAGE_WRITE @@ -34,10 +22,8 @@ #endif #include "tiny_gltf.h" -#include #include "vulkanexamplebase.h" - #define ENABLE_VALIDATION false // Contains everything required to render a basic glTF scene in Vulkan diff --git a/examples/hdr/hdr.cpp b/examples/hdr/hdr.cpp index 51b8fcba..37e40168 100644 --- a/examples/hdr/hdr.cpp +++ b/examples/hdr/hdr.cpp @@ -8,18 +8,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/imgui/main.cpp b/examples/imgui/main.cpp index 1d290419..15934c88 100644 --- a/examples/imgui/main.cpp +++ b/examples/imgui/main.cpp @@ -6,22 +6,7 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - #include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/indirectdraw/indirectdraw.cpp b/examples/indirectdraw/indirectdraw.cpp index 92426cc1..e567062f 100644 --- a/examples/indirectdraw/indirectdraw.cpp +++ b/examples/indirectdraw/indirectdraw.cpp @@ -19,20 +19,6 @@ * */ -#include -#include -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/inlineuniformblocks/inlineuniformblocks.cpp b/examples/inlineuniformblocks/inlineuniformblocks.cpp index eff84c9e..9fb0f92e 100644 --- a/examples/inlineuniformblocks/inlineuniformblocks.cpp +++ b/examples/inlineuniformblocks/inlineuniformblocks.cpp @@ -10,18 +10,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/inputattachments/inputattachments.cpp b/examples/inputattachments/inputattachments.cpp index 50d7ecca..426100b2 100644 --- a/examples/inputattachments/inputattachments.cpp +++ b/examples/inputattachments/inputattachments.cpp @@ -10,19 +10,6 @@ * at the same pixel position within a single render pass */ -#include -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/instancing/instancing.cpp b/examples/instancing/instancing.cpp index 5241a959..73219bb2 100644 --- a/examples/instancing/instancing.cpp +++ b/examples/instancing/instancing.cpp @@ -6,20 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/multisampling/multisampling.cpp b/examples/multisampling/multisampling.cpp index f3fb9a34..d962b253 100644 --- a/examples/multisampling/multisampling.cpp +++ b/examples/multisampling/multisampling.cpp @@ -6,18 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/multithreading/multithreading.cpp b/examples/multithreading/multithreading.cpp index 30f09bf9..1c6e2dc4 100644 --- a/examples/multithreading/multithreading.cpp +++ b/examples/multithreading/multithreading.cpp @@ -6,20 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "threadpool.hpp" diff --git a/examples/multiview/multiview.cpp b/examples/multiview/multiview.cpp index f333f67f..36066dc2 100644 --- a/examples/multiview/multiview.cpp +++ b/examples/multiview/multiview.cpp @@ -8,18 +8,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" @@ -305,7 +293,7 @@ public: const uint32_t viewMask = 0b00000011; /* - Bit mask that specifices correlation between views + Bit mask that specifies correlation between views An implementation may use this for optimizations (concurrent render) */ const uint32_t correlationMask = 0b00000011; diff --git a/examples/negativeviewportheight/negativeviewportheight.cpp b/examples/negativeviewportheight/negativeviewportheight.cpp index 6ac2ab8c..ba6a20fa 100644 --- a/examples/negativeviewportheight/negativeviewportheight.cpp +++ b/examples/negativeviewportheight/negativeviewportheight.cpp @@ -8,19 +8,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include -#include - -#include #include "vulkanexamplebase.h" #define ENABLE_VALIDATION false @@ -317,10 +304,10 @@ public: if (overlay->checkBox("Negative viewport height", &negativeViewport)) { buildCommandBuffers(); } - if (overlay->sliderInt("offfset x", &offsetx, -(int32_t)width, (int32_t)width)) { + if (overlay->sliderInt("offset x", &offsetx, -(int32_t)width, (int32_t)width)) { buildCommandBuffers(); } - if (overlay->sliderInt("offfset y", &offsety, -(int32_t)height, (int32_t)height)) { + if (overlay->sliderInt("offset y", &offsety, -(int32_t)height, (int32_t)height)) { buildCommandBuffers(); } } diff --git a/examples/nv_ray_tracing_basic/nv_ray_tracing_basic.cpp b/examples/nv_ray_tracing_basic/nv_ray_tracing_basic.cpp index 6a4e89f0..1e6316c7 100644 --- a/examples/nv_ray_tracing_basic/nv_ray_tracing_basic.cpp +++ b/examples/nv_ray_tracing_basic/nv_ray_tracing_basic.cpp @@ -6,18 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" // Ray tracing acceleration structure diff --git a/examples/nv_ray_tracing_reflections/nv_ray_tracing_reflections.cpp b/examples/nv_ray_tracing_reflections/nv_ray_tracing_reflections.cpp index 2d8acd57..12b80007 100644 --- a/examples/nv_ray_tracing_reflections/nv_ray_tracing_reflections.cpp +++ b/examples/nv_ray_tracing_reflections/nv_ray_tracing_reflections.cpp @@ -8,18 +8,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/nv_ray_tracing_shadows/nv_ray_tracing_shadows.cpp b/examples/nv_ray_tracing_shadows/nv_ray_tracing_shadows.cpp index 1a189de2..1f1428ff 100644 --- a/examples/nv_ray_tracing_shadows/nv_ray_tracing_shadows.cpp +++ b/examples/nv_ray_tracing_shadows/nv_ray_tracing_shadows.cpp @@ -8,18 +8,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/occlusionquery/occlusionquery.cpp b/examples/occlusionquery/occlusionquery.cpp index 6273af76..33f3fd7c 100644 --- a/examples/occlusionquery/occlusionquery.cpp +++ b/examples/occlusionquery/occlusionquery.cpp @@ -6,18 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/offscreen/offscreen.cpp b/examples/offscreen/offscreen.cpp index bce615a4..86c0b53c 100644 --- a/examples/offscreen/offscreen.cpp +++ b/examples/offscreen/offscreen.cpp @@ -6,18 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" @@ -655,7 +643,7 @@ public: { VulkanExampleBase::prepareFrame(); - // Command buffer to be sumitted to the queue + // Command buffer to be submitted to the queue submitInfo.commandBufferCount = 1; submitInfo.pCommandBuffers = &drawCmdBuffers[currentBuffer]; diff --git a/examples/parallaxmapping/parallaxmapping.cpp b/examples/parallaxmapping/parallaxmapping.cpp index fabfc5f6..b24a2d6b 100644 --- a/examples/parallaxmapping/parallaxmapping.cpp +++ b/examples/parallaxmapping/parallaxmapping.cpp @@ -6,19 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/particlefire/particlefire.cpp b/examples/particlefire/particlefire.cpp index d809fe5a..4900771a 100644 --- a/examples/particlefire/particlefire.cpp +++ b/examples/particlefire/particlefire.cpp @@ -6,20 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" @@ -480,7 +466,7 @@ public: pipelineCI.pVertexInputState = &vertexInputState; - // Dont' write to depth buffer + // Don t' write to depth buffer depthStencilState.depthWriteEnable = VK_FALSE; // Premulitplied alpha @@ -565,7 +551,7 @@ public: { VulkanExampleBase::prepareFrame(); - // Command buffer to be sumitted to the queue + // Command buffer to be submitted to the queue submitInfo.commandBufferCount = 1; submitInfo.pCommandBuffers = &drawCmdBuffers[currentBuffer]; diff --git a/examples/pbrbasic/pbrbasic.cpp b/examples/pbrbasic/pbrbasic.cpp index c24f3b7d..c88b9b50 100644 --- a/examples/pbrbasic/pbrbasic.cpp +++ b/examples/pbrbasic/pbrbasic.cpp @@ -8,18 +8,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/pbribl/pbribl.cpp b/examples/pbribl/pbribl.cpp index 2c56aa7c..8775f321 100644 --- a/examples/pbribl/pbribl.cpp +++ b/examples/pbribl/pbribl.cpp @@ -10,19 +10,6 @@ // For reference see http://blog.selfshadow.com/publications/s2013-shading-course/karis/s2013_pbs_epic_notes_v2.pdf -#include -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/pbrtexture/pbrtexture.cpp b/examples/pbrtexture/pbrtexture.cpp index 175932de..a3cdf617 100644 --- a/examples/pbrtexture/pbrtexture.cpp +++ b/examples/pbrtexture/pbrtexture.cpp @@ -10,19 +10,6 @@ // For reference see http://blog.selfshadow.com/publications/s2013-shading-course/karis/s2013_pbs_epic_notes_v2.pdf -#include -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/pipelines/pipelines.cpp b/examples/pipelines/pipelines.cpp index 6fb5148b..e4a65bec 100644 --- a/examples/pipelines/pipelines.cpp +++ b/examples/pipelines/pipelines.cpp @@ -6,18 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" @@ -257,7 +245,7 @@ public: // We are using this pipeline as the base for the other pipelines (derivatives) // Pipeline derivatives can be used for pipelines that share most of their state // Depending on the implementation this may result in better performance for pipeline - // switchting and faster creation time + // switching and faster creation time pipelineCI.flags = VK_PIPELINE_CREATE_ALLOW_DERIVATIVES_BIT; // Textured pipeline diff --git a/examples/pipelinestatistics/pipelinestatistics.cpp b/examples/pipelinestatistics/pipelinestatistics.cpp index 1968b63c..cfba59a8 100644 --- a/examples/pipelinestatistics/pipelinestatistics.cpp +++ b/examples/pipelinestatistics/pipelinestatistics.cpp @@ -6,18 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/pushconstants/pushconstants.cpp b/examples/pushconstants/pushconstants.cpp index 1c8653f0..5e34109b 100644 --- a/examples/pushconstants/pushconstants.cpp +++ b/examples/pushconstants/pushconstants.cpp @@ -13,18 +13,6 @@ * The sample uses these to push different static parameters for rendering multiple objects */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" @@ -269,7 +257,7 @@ public: { VulkanExampleBase::prepareFrame(); - // Command buffer to be sumitted to the queue + // Command buffer to be submitted to the queue submitInfo.commandBufferCount = 1; submitInfo.pCommandBuffers = &drawCmdBuffers[currentBuffer]; diff --git a/examples/pushdescriptors/pushdescriptors.cpp b/examples/pushdescriptors/pushdescriptors.cpp index 2176fe5d..e8df9602 100644 --- a/examples/pushdescriptors/pushdescriptors.cpp +++ b/examples/pushdescriptors/pushdescriptors.cpp @@ -13,19 +13,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/radialblur/radialblur.cpp b/examples/radialblur/radialblur.cpp index f683d9fc..f3a8ff49 100644 --- a/examples/radialblur/radialblur.cpp +++ b/examples/radialblur/radialblur.cpp @@ -6,18 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" @@ -594,7 +582,7 @@ public: { VulkanExampleBase::prepareFrame(); - // Command buffer to be sumitted to the queue + // Command buffer to be submitted to the queue submitInfo.commandBufferCount = 1; submitInfo.pCommandBuffers = &drawCmdBuffers[currentBuffer]; diff --git a/examples/screenshot/screenshot.cpp b/examples/screenshot/screenshot.cpp index ab24a953..bc9ca8d6 100644 --- a/examples/screenshot/screenshot.cpp +++ b/examples/screenshot/screenshot.cpp @@ -6,18 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/shadowmapping/shadowmapping.cpp b/examples/shadowmapping/shadowmapping.cpp index 17f5a2ac..b2c35607 100644 --- a/examples/shadowmapping/shadowmapping.cpp +++ b/examples/shadowmapping/shadowmapping.cpp @@ -6,18 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" @@ -576,7 +564,7 @@ public: { VulkanExampleBase::prepareFrame(); - // Command buffer to be sumitted to the queue + // Command buffer to be submitted to the queue submitInfo.commandBufferCount = 1; submitInfo.pCommandBuffers = &drawCmdBuffers[currentBuffer]; diff --git a/examples/shadowmappingcascade/shadowmappingcascade.cpp b/examples/shadowmappingcascade/shadowmappingcascade.cpp index 3bde2743..6734527a 100644 --- a/examples/shadowmappingcascade/shadowmappingcascade.cpp +++ b/examples/shadowmappingcascade/shadowmappingcascade.cpp @@ -17,18 +17,6 @@ cascades instead of multiple passes (geometry shaders are not supported on all target devices). */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/shadowmappingomni/shadowmappingomni.cpp b/examples/shadowmappingomni/shadowmappingomni.cpp index e0132ccc..3c424595 100644 --- a/examples/shadowmappingomni/shadowmappingomni.cpp +++ b/examples/shadowmappingomni/shadowmappingomni.cpp @@ -6,18 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/specializationconstants/specializationconstants.cpp b/examples/specializationconstants/specializationconstants.cpp index 5c4ca48f..005f45aa 100644 --- a/examples/specializationconstants/specializationconstants.cpp +++ b/examples/specializationconstants/specializationconstants.cpp @@ -8,18 +8,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/sphericalenvmapping/sphericalenvmapping.cpp b/examples/sphericalenvmapping/sphericalenvmapping.cpp index a20705ee..6b09a922 100644 --- a/examples/sphericalenvmapping/sphericalenvmapping.cpp +++ b/examples/sphericalenvmapping/sphericalenvmapping.cpp @@ -10,19 +10,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/ssao/ssao.cpp b/examples/ssao/ssao.cpp index 988b18c5..7403b75a 100644 --- a/examples/ssao/ssao.cpp +++ b/examples/ssao/ssao.cpp @@ -6,19 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/stencilbuffer/stencilbuffer.cpp b/examples/stencilbuffer/stencilbuffer.cpp index 30ff623d..b770e748 100644 --- a/examples/stencilbuffer/stencilbuffer.cpp +++ b/examples/stencilbuffer/stencilbuffer.cpp @@ -6,18 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/subpasses/subpasses.cpp b/examples/subpasses/subpasses.cpp index 8fbe6bfc..768a7e9d 100644 --- a/examples/subpasses/subpasses.cpp +++ b/examples/subpasses/subpasses.cpp @@ -16,19 +16,6 @@ * */ -#include -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" @@ -881,7 +868,7 @@ public: { VulkanExampleBase::prepareFrame(); - // Command buffer to be sumitted to the queue + // Command buffer to be submitted to the queue submitInfo.commandBufferCount = 1; submitInfo.pCommandBuffers = &drawCmdBuffers[currentBuffer]; diff --git a/examples/terraintessellation/terraintessellation.cpp b/examples/terraintessellation/terraintessellation.cpp index a99df1ae..0f3b3f41 100644 --- a/examples/terraintessellation/terraintessellation.cpp +++ b/examples/terraintessellation/terraintessellation.cpp @@ -6,19 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" #include "frustum.hpp" @@ -801,7 +788,7 @@ public: { VulkanExampleBase::prepareFrame(); - // Command buffer to be sumitted to the queue + // Command buffer to be submitted to the queue submitInfo.commandBufferCount = 1; submitInfo.pCommandBuffers = &drawCmdBuffers[currentBuffer]; diff --git a/examples/tessellation/tessellation.cpp b/examples/tessellation/tessellation.cpp index 62193bcc..d0613e5f 100644 --- a/examples/tessellation/tessellation.cpp +++ b/examples/tessellation/tessellation.cpp @@ -9,18 +9,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/textoverlay/textoverlay.cpp b/examples/textoverlay/textoverlay.cpp index 86a41b69..d54eb70b 100644 --- a/examples/textoverlay/textoverlay.cpp +++ b/examples/textoverlay/textoverlay.cpp @@ -6,25 +6,10 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include #include #include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include -#include - -#include - #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" - #include "../external/stb/stb_font_consolas_24_latin1.inl" #define ENABLE_VALIDATION false @@ -872,7 +857,7 @@ public: commandBuffers.push_back(textOverlay->cmdBuffers[currentBuffer]); } - // Command buffer to be sumitted to the queue + // Command buffer to be submitted to the queue submitInfo.commandBufferCount = static_cast(commandBuffers.size()); submitInfo.pCommandBuffers = commandBuffers.data(); diff --git a/examples/texture/texture.cpp b/examples/texture/texture.cpp index 5b461e57..932fe71c 100644 --- a/examples/texture/texture.cpp +++ b/examples/texture/texture.cpp @@ -6,17 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include - -#include #include "vulkanexamplebase.h" #include #include @@ -173,7 +162,7 @@ public: bool forceLinearTiling = false; if (forceLinearTiling) { // Don't use linear if format is not supported for (linear) shader sampling - // Get device properites for the requested texture format + // Get device properties for the requested texture format VkFormatProperties formatProperties; vkGetPhysicalDeviceFormatProperties(physicalDevice, format, &formatProperties); useStaging = !(formatProperties.linearTilingFeatures & VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT); @@ -307,7 +296,7 @@ public: imageMemoryBarrier.newLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; // Insert a memory dependency at the proper pipeline stages that will execute the image layout transition - // Source pipeline stage stage is copy command exection (VK_PIPELINE_STAGE_TRANSFER_BIT) + // Source pipeline stage is copy command execution (VK_PIPELINE_STAGE_TRANSFER_BIT) // Destination pipeline stage fragment shader access (VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT) vkCmdPipelineBarrier( copyCmd, @@ -387,7 +376,7 @@ public: imageMemoryBarrier.newLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; // Insert a memory dependency at the proper pipeline stages that will execute the image layout transition - // Source pipeline stage is host write/read exection (VK_PIPELINE_STAGE_HOST_BIT) + // Source pipeline stage is host write/read execution (VK_PIPELINE_STAGE_HOST_BIT) // Destination pipeline stage fragment shader access (VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT) vkCmdPipelineBarrier( copyCmd, @@ -517,7 +506,7 @@ public: { VulkanExampleBase::prepareFrame(); - // Command buffer to be sumitted to the queue + // Command buffer to be submitted to the queue submitInfo.commandBufferCount = 1; submitInfo.pCommandBuffers = &drawCmdBuffers[currentBuffer]; diff --git a/examples/texture3d/texture3d.cpp b/examples/texture3d/texture3d.cpp index eb0e908b..1a7769f0 100644 --- a/examples/texture3d/texture3d.cpp +++ b/examples/texture3d/texture3d.cpp @@ -6,21 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #define VERTEX_BUFFER_BIND_ID 0 @@ -496,7 +481,7 @@ public: { VulkanExampleBase::prepareFrame(); - // Command buffer to be sumitted to the queue + // Command buffer to be submitted to the queue submitInfo.commandBufferCount = 1; submitInfo.pCommandBuffers = &drawCmdBuffers[currentBuffer]; diff --git a/examples/texturearray/texturearray.cpp b/examples/texturearray/texturearray.cpp index 57ba4f1f..f5877d07 100644 --- a/examples/texturearray/texturearray.cpp +++ b/examples/texturearray/texturearray.cpp @@ -6,19 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include #include @@ -464,7 +451,7 @@ public: vertexInputStateCI.vertexAttributeDescriptionCount = static_cast(vertexInputAttributes.size()); vertexInputStateCI.pVertexAttributeDescriptions = vertexInputAttributes.data(); - // Instacing pipeline + // Instancing pipeline std::array shaderStages; shaderStages[0] = loadShader(getShadersPath() + "texturearray/instancing.vert.spv", VK_SHADER_STAGE_VERTEX_BIT); diff --git a/examples/texturecubemap/texturecubemap.cpp b/examples/texturecubemap/texturecubemap.cpp index d7609dbe..d5ba0e1f 100644 --- a/examples/texturecubemap/texturecubemap.cpp +++ b/examples/texturecubemap/texturecubemap.cpp @@ -6,18 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" #include diff --git a/examples/texturecubemaparray/texturecubemaparray.cpp b/examples/texturecubemaparray/texturecubemaparray.cpp index e2044237..7c7c5bcc 100644 --- a/examples/texturecubemaparray/texturecubemaparray.cpp +++ b/examples/texturecubemaparray/texturecubemaparray.cpp @@ -6,18 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" #include diff --git a/examples/texturemipmapgen/texturemipmapgen.cpp b/examples/texturemipmapgen/texturemipmapgen.cpp index b2d0d527..66cf897a 100644 --- a/examples/texturemipmapgen/texturemipmapgen.cpp +++ b/examples/texturemipmapgen/texturemipmapgen.cpp @@ -6,19 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" #include @@ -130,7 +117,7 @@ public: // Calculated as log2(max(width, height, depth))c + 1 (see specs) texture.mipLevels = floor(log2(std::max(texture.width, texture.height))) + 1; - // Get device properites for the requested texture format + // Get device properties for the requested texture format VkFormatProperties formatProperties; vkGetPhysicalDeviceFormatProperties(physicalDevice, format, &formatProperties); // Mip-chain generation requires support for blit source and destination @@ -419,7 +406,7 @@ public: { VulkanExampleBase::prepareFrame(); - // Command buffer to be sumitted to the queue + // Command buffer to be submitted to the queue submitInfo.commandBufferCount = 1; submitInfo.pCommandBuffers = &drawCmdBuffers[currentBuffer]; diff --git a/examples/texturesparseresidency/texturesparseresidency.h b/examples/texturesparseresidency/texturesparseresidency.h index 78cb46c3..bcc19581 100644 --- a/examples/texturesparseresidency/texturesparseresidency.h +++ b/examples/texturesparseresidency/texturesparseresidency.h @@ -10,21 +10,6 @@ * Note : This sample is work-in-progress and works basically, but it's not yet finished */ -#include -#include -#include -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" diff --git a/examples/triangle/triangle.cpp b/examples/triangle/triangle.cpp index d43e130d..40935012 100644 --- a/examples/triangle/triangle.cpp +++ b/examples/triangle/triangle.cpp @@ -341,7 +341,7 @@ public: // Pipeline stage at which the queue submission will wait (via pWaitSemaphores) VkPipelineStageFlags waitStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; - // The submit info structure specifices a command buffer queue submission batch + // The submit info structure specifies a command buffer queue submission batch VkSubmitInfo submitInfo = {}; submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; submitInfo.pWaitDstStageMask = &waitStageMask; // Pointer to the list of pipeline stages that the semaphore waits will occur at @@ -370,8 +370,8 @@ public: void prepareVertices(bool useStagingBuffers) { // A note on memory management in Vulkan in general: - // This is a very complex topic and while it's fine for an example application to to small individual memory allocations that is not - // what should be done a real-world application, where you should allocate large chunkgs of memory at once isntead. + // This is a very complex topic and while it's fine for an example application to small individual memory allocations that is not + // what should be done a real-world application, where you should allocate large chunks of memory at once instead. // Setup vertices std::vector vertexBuffer = @@ -733,7 +733,7 @@ public: VkAttachmentReference depthReference = {}; depthReference.attachment = 1; // Attachment 1 is color - depthReference.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; // Attachment used as depth/stemcil used during the subpass + depthReference.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; // Attachment used as depth/stencil used during the subpass // Setup a single subpass reference VkSubpassDescription subpassDescription = {}; @@ -758,7 +758,7 @@ public: // First dependency at the start of the renderpass // Does the transition from final to initial layout dependencies[0].srcSubpass = VK_SUBPASS_EXTERNAL; // Producer of the dependency - dependencies[0].dstSubpass = 0; // Consumer is our single subpass that will wait for the execution depdendency + dependencies[0].dstSubpass = 0; // Consumer is our single subpass that will wait for the execution dependency dependencies[0].srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; // Match our pWaitDstStageMask when we vkQueueSubmit dependencies[0].dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; // is a loadOp stage for color attachments dependencies[0].srcAccessMask = 0; // semaphore wait already does memory dependency for us @@ -857,7 +857,7 @@ public: // Renderpass this pipeline is attached to pipelineCreateInfo.renderPass = renderPass; - // Construct the differnent states making up the pipeline + // Construct the different states making up the pipeline // Input assembly state describes how primitives are assembled // This pipeline will assemble vertex data as a triangle lists (though we only use one triangle) @@ -887,7 +887,7 @@ public: colorBlendState.pAttachments = blendAttachmentState; // Viewport state sets the number of viewports and scissor used in this pipeline - // Note: This is actually overriden by the dynamic states (see below) + // Note: This is actually overridden by the dynamic states (see below) VkPipelineViewportStateCreateInfo viewportState = {}; viewportState.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO; viewportState.viewportCount = 1; @@ -920,7 +920,7 @@ public: depthStencilState.front = depthStencilState.back; // Multi sampling state - // This example does not make use fo multi sampling (for anti-aliasing), the state must still be set and passed to the pipeline + // This example does not make use of multi sampling (for anti-aliasing), the state must still be set and passed to the pipeline VkPipelineMultisampleStateCreateInfo multisampleState = {}; multisampleState.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; multisampleState.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; @@ -936,7 +936,7 @@ public: vertexInputBinding.stride = sizeof(Vertex); vertexInputBinding.inputRate = VK_VERTEX_INPUT_RATE_VERTEX; - // Inpute attribute bindings describe shader attribute locations and memory layouts + // Input attribute bindings describe shader attribute locations and memory layouts std::array vertexInputAttributs; // These match the following shader layout (see triangle.vert): // layout (location = 0) in vec3 inPos; @@ -1032,7 +1032,7 @@ public: // Get memory requirements including size, alignment and memory type vkGetBufferMemoryRequirements(device, uniformBufferVS.buffer, &memReqs); allocInfo.allocationSize = memReqs.size; - // Get the memory type index that supports host visibile memory access + // Get the memory type index that supports host visible memory access // Most implementations offer multiple memory types and selecting the correct one to allocate memory from is crucial // We also want the buffer to be host coherent so we don't have to flush (or sync after every update. // Note: This may affect performance so you might not want to do this in a real world application that updates buffers on a regular base @@ -1095,7 +1095,7 @@ public: }; // OS specific macros for the example main entry points -// Most of the code base is shared for the different supported operating systems, but stuff like message handling diffes +// Most of the code base is shared for the different supported operating systems, but stuff like message handling differs #if defined(_WIN32) // Windows entry point diff --git a/examples/viewportarray/viewportarray.cpp b/examples/viewportarray/viewportarray.cpp index 92b2d1cf..f5f9ff52 100644 --- a/examples/viewportarray/viewportarray.cpp +++ b/examples/viewportarray/viewportarray.cpp @@ -6,18 +6,6 @@ * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" @@ -223,7 +211,7 @@ public: shaderStages[0] = loadShader(getShadersPath() + "viewportarray/scene.vert.spv", VK_SHADER_STAGE_VERTEX_BIT); shaderStages[1] = loadShader(getShadersPath() + "viewportarray/scene.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT); // A geometry shader is used to output geometry to multiple viewports in one single pass - // See the "invoctations" decorator of the layout input in the shader + // See the "invocations" decorator of the layout input in the shader shaderStages[2] = loadShader(getShadersPath() + "viewportarray/multiview.geom.spv", VK_SHADER_STAGE_GEOMETRY_BIT); VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCI, nullptr, &pipeline)); } diff --git a/examples/vulkanscene/vulkanscene.cpp b/examples/vulkanscene/vulkanscene.cpp index 8c4185c9..23bd11a6 100644 --- a/examples/vulkanscene/vulkanscene.cpp +++ b/examples/vulkanscene/vulkanscene.cpp @@ -10,19 +10,6 @@ * This code is licensed under the Mozilla Public License Version 2.0 (http://opensource.org/licenses/MPL-2.0) */ -#include -#include -#include -#include -#include - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include -#include - -#include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h"