Minor cleanup

Author: SaschaWillems

base/VulkanRaytracingSample.cpp

@@ -95,14 +95,13 @@ void VulkanRaytracingSample::setupRenderPass()
 
 void VulkanRaytracingSample::setupFrameBuffer()
 {
-	VkImageView attachments[2];
+	VkImageView attachments[2]{};
 
 	// Depth/Stencil attachment is the same for all frame buffers
 	attachments[1] = depthStencil.view;
 
-	VkFramebufferCreateInfo frameBufferCreateInfo = {};
+	VkFramebufferCreateInfo frameBufferCreateInfo{};
 	frameBufferCreateInfo.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO;
-	frameBufferCreateInfo.pNext = NULL;
 	frameBufferCreateInfo.renderPass = renderPass;
 	frameBufferCreateInfo.attachmentCount = 2;
 	frameBufferCreateInfo.pAttachments = attachments;
@@ -342,7 +341,7 @@ void VulkanRaytracingSample::createShaderBindingTable(ShaderBindingTable& shader
 
 void VulkanRaytracingSample::drawUI(VkCommandBuffer commandBuffer, VkFramebuffer framebuffer)
 {
-	VkClearValue clearValues[2];
+	VkClearValue clearValues[2]{};
 	clearValues[0].color = defaultClearColor;
 	clearValues[1].depthStencil = { 1.0f, 0 };
 

base/VulkanRaytracingSample.h

@@ -21,16 +21,16 @@ class VulkanRaytracingSample : public VulkanExampleBase
 	virtual void setupFrameBuffer();
 public:
 	// Function pointers for ray tracing related stuff
-	PFN_vkGetBufferDeviceAddressKHR vkGetBufferDeviceAddressKHR;
-	PFN_vkCreateAccelerationStructureKHR vkCreateAccelerationStructureKHR;
-	PFN_vkDestroyAccelerationStructureKHR vkDestroyAccelerationStructureKHR;
-	PFN_vkGetAccelerationStructureBuildSizesKHR vkGetAccelerationStructureBuildSizesKHR;
-	PFN_vkGetAccelerationStructureDeviceAddressKHR vkGetAccelerationStructureDeviceAddressKHR;
-	PFN_vkBuildAccelerationStructuresKHR vkBuildAccelerationStructuresKHR;
-	PFN_vkCmdBuildAccelerationStructuresKHR vkCmdBuildAccelerationStructuresKHR;
-	PFN_vkCmdTraceRaysKHR vkCmdTraceRaysKHR;
-	PFN_vkGetRayTracingShaderGroupHandlesKHR vkGetRayTracingShaderGroupHandlesKHR;
-	PFN_vkCreateRayTracingPipelinesKHR vkCreateRayTracingPipelinesKHR;
+	PFN_vkGetBufferDeviceAddressKHR vkGetBufferDeviceAddressKHR{ nullptr };
+	PFN_vkCreateAccelerationStructureKHR vkCreateAccelerationStructureKHR{ nullptr };
+	PFN_vkDestroyAccelerationStructureKHR vkDestroyAccelerationStructureKHR{ nullptr };
+	PFN_vkGetAccelerationStructureBuildSizesKHR vkGetAccelerationStructureBuildSizesKHR{ nullptr };
+	PFN_vkGetAccelerationStructureDeviceAddressKHR vkGetAccelerationStructureDeviceAddressKHR{ nullptr };
+	PFN_vkBuildAccelerationStructuresKHR vkBuildAccelerationStructuresKHR{ nullptr };
+	PFN_vkCmdBuildAccelerationStructuresKHR vkCmdBuildAccelerationStructuresKHR{ nullptr };
+	PFN_vkCmdTraceRaysKHR vkCmdTraceRaysKHR{ nullptr };
+	PFN_vkGetRayTracingShaderGroupHandlesKHR vkGetRayTracingShaderGroupHandlesKHR{ nullptr };
+	PFN_vkCreateRayTracingPipelinesKHR vkCreateRayTracingPipelinesKHR{ nullptr };
 
 	// Available features and properties
 	VkPhysicalDeviceRayTracingPipelinePropertiesKHR  rayTracingPipelineProperties{};

examples/raytracingbasic/raytracingbasic.cpp

@@ -27,16 +27,16 @@ struct AccelerationStructure {
 class VulkanExample : public VulkanExampleBase
 {
 public:
-	PFN_vkGetBufferDeviceAddressKHR vkGetBufferDeviceAddressKHR;
-	PFN_vkCreateAccelerationStructureKHR vkCreateAccelerationStructureKHR;
-	PFN_vkDestroyAccelerationStructureKHR vkDestroyAccelerationStructureKHR;
-	PFN_vkGetAccelerationStructureBuildSizesKHR vkGetAccelerationStructureBuildSizesKHR;
-	PFN_vkGetAccelerationStructureDeviceAddressKHR vkGetAccelerationStructureDeviceAddressKHR;
-	PFN_vkCmdBuildAccelerationStructuresKHR vkCmdBuildAccelerationStructuresKHR;
-	PFN_vkBuildAccelerationStructuresKHR vkBuildAccelerationStructuresKHR;
-	PFN_vkCmdTraceRaysKHR vkCmdTraceRaysKHR;
-	PFN_vkGetRayTracingShaderGroupHandlesKHR vkGetRayTracingShaderGroupHandlesKHR;
-	PFN_vkCreateRayTracingPipelinesKHR vkCreateRayTracingPipelinesKHR;
+	PFN_vkGetBufferDeviceAddressKHR vkGetBufferDeviceAddressKHR{ nullptr };
+	PFN_vkCreateAccelerationStructureKHR vkCreateAccelerationStructureKHR{ nullptr };
+	PFN_vkDestroyAccelerationStructureKHR vkDestroyAccelerationStructureKHR{ nullptr };
+	PFN_vkGetAccelerationStructureBuildSizesKHR vkGetAccelerationStructureBuildSizesKHR{ nullptr };
+	PFN_vkGetAccelerationStructureDeviceAddressKHR vkGetAccelerationStructureDeviceAddressKHR{ nullptr };
+	PFN_vkCmdBuildAccelerationStructuresKHR vkCmdBuildAccelerationStructuresKHR{ nullptr };
+	PFN_vkBuildAccelerationStructuresKHR vkBuildAccelerationStructuresKHR{ nullptr };
+	PFN_vkCmdTraceRaysKHR vkCmdTraceRaysKHR{ nullptr };
+	PFN_vkGetRayTracingShaderGroupHandlesKHR vkGetRayTracingShaderGroupHandlesKHR{ nullptr };
+	PFN_vkCreateRayTracingPipelinesKHR vkCreateRayTracingPipelinesKHR{ nullptr };
 
 	VkPhysicalDeviceRayTracingPipelinePropertiesKHR  rayTracingPipelineProperties{};
 	VkPhysicalDeviceAccelerationStructureFeaturesKHR accelerationStructureFeatures{};
@@ -50,7 +50,7 @@ class VulkanExample : public VulkanExampleBase
 
 	vks::Buffer vertexBuffer;
 	vks::Buffer indexBuffer;
-	uint32_t indexCount;
+	uint32_t indexCount{ 0 };
 	vks::Buffer transformBuffer;
 	std::vector<VkRayTracingShaderGroupCreateInfoKHR> shaderGroups{};
 	vks::Buffer raygenShaderBindingTable;
@@ -62,7 +62,7 @@ class VulkanExample : public VulkanExampleBase
 		VkImage image;
 		VkImageView view;
 		VkFormat format;
-	} storageImage;
+	} storageImage{};
 
 	struct UniformData {
 		glm::mat4 viewInverse;

examples/raytracinggltf/raytracinggltf.cpp

@@ -580,7 +580,7 @@ class VulkanExample : public VulkanRaytracingSample
 
 			// Image descriptors for the variable no. of images of the glTF model
 			std::vector<VkDescriptorImageInfo> textureDescriptors{};
-			for (auto texture : model.textures) {
+			for (auto& texture : model.textures) {
 				VkDescriptorImageInfo descriptor{};
 				descriptor.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
 				descriptor.sampler = texture.sampler;

examples/raytracingtextures/raytracingtextures.cpp

@@ -628,7 +628,7 @@ class VulkanExample : public VulkanRaytracingSample
 		struct BufferReferences {
 			uint64_t vertices;
 			uint64_t indices;
-		} bufferReferences;
+		} bufferReferences{};
 
 		bufferReferences.vertices = getBufferDeviceAddress(vertexBuffer.buffer);
 		bufferReferences.indices = getBufferDeviceAddress(indexBuffer.buffer);

examples/renderheadless/renderheadless.cpp

@@ -43,8 +43,6 @@ android_app* androidapp;
 
 #define DEBUG (!NDEBUG)
 
-#define BUFFER_ELEMENTS 32
-
 #if defined(VK_USE_PLATFORM_ANDROID_KHR)
 #define LOG(...) ((void)__android_log_print(ANDROID_LOG_INFO, "vulkanExample", __VA_ARGS__))
 #else

examples/triangle/triangle.cpp

@@ -30,7 +30,7 @@
 // We want to keep GPU and CPU busy. To do that we may start building a new command buffer while the previous one is still being executed
 // This number defines how many frames may be worked on simultaneously at once
 // Increasing this number may improve performance but will also introduce additional latency
-#define MAX_CONCURRENT_FRAMES 2
+constexpr auto MAX_CONCURRENT_FRAMES = 2;
 
 class VulkanExample : public VulkanExampleBase
 {

examples/trianglevulkan13/trianglevulkan13.cpp

@@ -29,7 +29,7 @@
 // We want to keep GPU and CPU busy. To do that we may start building a new command buffer while the previous one is still being executed
 // This number defines how many frames may be worked on simultaneously at once
 // Increasing this number may improve performance but will also introduce additional latency
-#define MAX_CONCURRENT_FRAMES 2
+constexpr auto MAX_CONCURRENT_FRAMES = 2;
 
 class VulkanExample : public VulkanExampleBase
 {