From 846413cc4bbaec6250d0f73a73a6d217bbd7dc61 Mon Sep 17 00:00:00 2001
From: Sascha Willems <webmaster@saschawillems.de>
Date: Sat, 12 Dec 2020 08:40:28 +0100
Subject: [PATCH] Release resources, fixes validation

Scene setup
---
 examples/rayquery/rayquery.cpp                | 19 ++++++++-----------
 .../raytracingcallable/raytracingcallable.cpp |  3 +++
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/examples/rayquery/rayquery.cpp b/examples/rayquery/rayquery.cpp
index 79867848..e2747f9c 100644
--- a/examples/rayquery/rayquery.cpp
+++ b/examples/rayquery/rayquery.cpp
@@ -40,12 +40,12 @@ public:
 
 	VulkanExample() : VulkanRaytracingSample()
 	{
-		title = "Ray query";
+		title = "Ray queries for ray traced shadows";
 		camera.type = Camera::CameraType::lookat;
-		camera.setPosition(glm::vec3(0.0f, -0.0f, -20.0f));
-		camera.setRotation(glm::vec3(-15.0f, -390.0f, 0.0f));
-		camera.setPerspective(60.0f, (float)width / (float)height, 1.0f, 256.0f);
-		timerSpeed *= 0.5f;
+		timerSpeed *= 0.25f;
+		camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 512.0f);
+		camera.setRotation(glm::vec3(0.0f, 0.0f, 0.0f));
+		camera.setTranslation(glm::vec3(0.0f, 3.0f, -10.0f));
 		settings.overlay = true;
 		enableExtensions();
 		enabledDeviceExtensions.push_back(VK_KHR_RAY_QUERY_EXTENSION_NAME);
@@ -57,6 +57,8 @@ public:
 		vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
 		vkDestroyDescriptorSetLayout(device, descriptorSetLayout, nullptr);
 		ubo.destroy();
+		deleteAccelerationStructure(bottomLevelAS);
+		deleteAccelerationStructure(topLevelAS);
 	}
 
 	/*
@@ -269,7 +271,7 @@ public:
 				Second pass: Scene rendering with applied shadow map
 			*/
 
-			clearValues[0].color = defaultClearColor;
+			clearValues[0].color = { { 0.0f, 0.0f, 0.2f, 1.0f } };;
 			clearValues[1].depthStencil = { 1.0f, 0 };
 
 			VkRenderPassBeginInfo renderPassBeginInfo = vks::initializers::renderPassBeginInfo();
@@ -306,11 +308,6 @@ public:
 		vkglTF::memoryPropertyFlags = VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT;
 		const uint32_t glTFLoadingFlags = vkglTF::FileLoadingFlags::PreTransformVertices | vkglTF::FileLoadingFlags::PreMultiplyVertexColors | vkglTF::FileLoadingFlags::FlipY;
 		scene.loadFromFile(getAssetPath() + "models/vulkanscene_shadow.gltf", vulkanDevice, queue, glTFLoadingFlags);
-		//const uint32_t glTFLoadingFlags = vkglTF::FileLoadingFlags::PreTransformVertices | vkglTF::FileLoadingFlags::PreMultiplyVertexColors | vkglTF::FileLoadingFlags::FlipY;
-		//scenes.resize(2);
-		//scenes[0].loadFromFile(getAssetPath() + "models/vulkanscene_shadow.gltf", vulkanDevice, queue, glTFLoadingFlags);
-		//scenes[1].loadFromFile(getAssetPath() + "models/samplescene.gltf", vulkanDevice, queue, glTFLoadingFlags);
-		//sceneNames = {"Vulkan scene", "Teapots and pillars" };
 	}
 
 	void setupDescriptorPool()
diff --git a/examples/raytracingcallable/raytracingcallable.cpp b/examples/raytracingcallable/raytracingcallable.cpp
index 26c5a50a..ef5394a9 100644
--- a/examples/raytracingcallable/raytracingcallable.cpp
+++ b/examples/raytracingcallable/raytracingcallable.cpp
@@ -66,6 +66,9 @@ public:
 		shaderBindingTables.miss.destroy();
 		shaderBindingTables.hit.destroy();
 		shaderBindingTables.callable.destroy();
+		vertexBuffer.destroy();
+		indexBuffer.destroy();
+		transformBuffer.destroy();
 		ubo.destroy();
 	}