Merge branch 'dev'

gameknife · Jun 12, 2024 · fc02ae9 · fc02ae9
2 parents 9af7d17 + 03c6f8d
commit fc02ae9
Show file tree

Hide file tree

Showing 18 changed files with 422 additions and 143 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -81,6 +81,25 @@
         "unordered_set": "cpp",
         "valarray": "cpp",
         "variant": "cpp",
-        "algorithm": "cpp"
+        "algorithm": "cpp",
+        "bit": "cpp",
+        "*.tcc": "cpp",
+        "chrono": "cpp",
+        "cinttypes": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "expected": "cpp",
+        "functional": "cpp",
+        "iterator": "cpp",
+        "memory": "cpp",
+        "memory_resource": "cpp",
+        "numeric": "cpp",
+        "random": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "format": "cpp",
+        "ranges": "cpp",
+        "stop_token": "cpp",
+        "cfenv": "cpp"
     },
 }
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -23,9 +23,10 @@
         android:theme="@style/Application.Fullscreen">
 
         <activity android:name=".MainActivity"
-                android:screenOrientation="landscape"
-                android:configChanges="orientation|keyboardHidden"
+                android:screenOrientation="portrait"
+                android:configChanges="orientation|screenSize|keyboardHidden"
                 android:exported="true"
+
             tools:ignore="DiscouragedApi">
             <!-- Tell GameActivity the name of our .so file.
                  This will be optional after the release 1.1.0 -->

diff --git a/src/Application.cpp b/src/Application.cpp
@@ -67,6 +67,9 @@ Assets::UniformBufferObject NextRendererApplication<Renderer>::GetUniformBufferO
                                       extent.width / static_cast<float>(extent.height), 0.1f, 10000.0f);
     ubo.Projection[1][1] *= -1;
 #if ANDROID
+    ubo.Projection = glm::perspective(glm::radians(userSettings_.FieldOfView),
+                                      extent.height / static_cast<float>(extent.width), 0.1f, 10000.0f);
+    ubo.Projection[1][1] *= -1;
     ubo.Projection = pre_rotate_mat * ubo.Projection;
 #endif
     // Inverting Y for Vulkan, https://matthewwellings.com/blog/the-new-vulkan-coordinate-system/
@@ -233,6 +236,7 @@ void NextRendererApplication<Renderer>::Render(VkCommandBuffer commandBuffer, co
     Statistics stats = {};
     stats.FramebufferSize = Renderer::Window().FramebufferSize();
     stats.FrameRate = frameRate;
+    stats.FrameTime = static_cast<float>(timeDelta * 1000);
 
     stats.CamPosX = modelViewController_.Position()[0];
     stats.CamPosY = modelViewController_.Position()[1];
@@ -254,7 +258,7 @@ void NextRendererApplication<Renderer>::Render(VkCommandBuffer commandBuffer, co
         stats.TotalSamples = totalNumberOfSamples_;
     }
 
-    userInterface_->Render(commandBuffer, Renderer::SwapChainFrameBuffer(imageIndex), stats);
+    userInterface_->Render(commandBuffer, Renderer::SwapChainFrameBuffer(imageIndex), stats, Renderer::GpuTimer());
 }
 
 template <typename Renderer>

diff --git a/src/Options.cpp b/src/Options.cpp
@@ -48,6 +48,7 @@ Options::Options(const int argc, const char* argv[])
 		("help", "Display help message.")
 		("benchmark", bool_switch(&Benchmark)->default_value(false), "Run the application in benchmark mode.")
 		("savefile", bool_switch(&SaveFile)->default_value(false), "Save screenshot every benchmark finish.")
+		("renderdoc", bool_switch(&RenderDoc)->default_value(false), "Attach renderdoc if avaliable.")
 		;
 
 	desc.add(benchmark);

diff --git a/src/Options.hpp b/src/Options.hpp
@@ -22,6 +22,7 @@ class Options final
 	// Application options.
 	bool Benchmark{};
 	bool SaveFile{};
+	bool RenderDoc{};
 
 	// Benchmark options.
 	bool BenchmarkNextScenes{};

diff --git a/src/UserInterface.cpp b/src/UserInterface.cpp
@@ -24,6 +24,7 @@
 #include <array>
 
 #include "Utilities/FileHelper.hpp"
+#include "Vulkan/VulkanBaseRenderer.hpp"
 
 namespace
 {
@@ -94,7 +95,7 @@ UserInterface::UserInterface(
 
 	// Window scaling and style.
 #if ANDROID
-    const auto scaleFactor = 4.0;
+    const auto scaleFactor = 1.5;
 #else
     const auto scaleFactor = 1.0;//window.ContentScale();
 #endif
@@ -130,7 +131,7 @@ UserInterface::~UserInterface()
 	ImGui::DestroyContext();
 }
 
-void UserInterface::Render(VkCommandBuffer commandBuffer, const Vulkan::FrameBuffer& frameBuffer, const Statistics& statistics)
+void UserInterface::Render(VkCommandBuffer commandBuffer, const Vulkan::FrameBuffer& frameBuffer, const Statistics& statistics, Vulkan::VulkanGpuTimer* gpuTimer)
 {
 #if !ANDROID
 	ImGui_ImplGlfw_NewFrame();
@@ -143,7 +144,7 @@ void UserInterface::Render(VkCommandBuffer commandBuffer, const Vulkan::FrameBuf
 #if !ANDROID
 	DrawSettings();
 #endif
-	DrawOverlay(statistics);
+	DrawOverlay(statistics, gpuTimer);
 	//ImGui::ShowStyleEditor();
 	ImGui::Render();
 
@@ -258,7 +259,7 @@ void UserInterface::DrawSettings()
 	ImGui::End();
 }
 
-void UserInterface::DrawOverlay(const Statistics& statistics)
+void UserInterface::DrawOverlay(const Statistics& statistics, Vulkan::VulkanGpuTimer* gpuTimer)
 {
 	if (!Settings().ShowOverlay)
 	{
@@ -267,8 +268,13 @@ void UserInterface::DrawOverlay(const Statistics& statistics)
 
 	const auto& io = ImGui::GetIO();
 	const float distance = 10.0f;
+#if ANDROID
+	const ImVec2 pos = ImVec2(distance, distance);
+	const ImVec2 posPivot = ImVec2(0.0f, 0.0f);
+#else
 	const ImVec2 pos = ImVec2(io.DisplaySize.x - distance, distance);
 	const ImVec2 posPivot = ImVec2(1.0f, 0.0f);
+#endif
 	ImGui::SetNextWindowPos(pos, ImGuiCond_Always, posPivot);
 	ImGui::SetNextWindowBgAlpha(0.3f); // Transparent background
 
@@ -285,11 +291,17 @@ void UserInterface::DrawOverlay(const Statistics& statistics)
 		ImGui::Text("Statistics (%dx%d):", statistics.FramebufferSize.width, statistics.FramebufferSize.height);
 		ImGui::Separator();
 		ImGui::Text("Frame rate: %.0f fps", statistics.FrameRate);
-		ImGui::Text("Primary ray rate: %.2f Gr/s", statistics.RayRate);
-		ImGui::Text("Accumulated samples:  %u", statistics.TotalSamples);
 		ImGui::Text("Campos:  %.2f %.2f %.2f", statistics.CamPosX, statistics.CamPosY, statistics.CamPosZ);
 		ImGui::Text("Tris: %d", statistics.TriCount);
 		ImGui::Text("Instance: %d", statistics.InstanceCount);
+
+		ImGui::Text("frametime: %.2fms", statistics.FrameTime);
+		// auto fetch timer & display
+		auto times = gpuTimer->FetchAllTimes();
+		for(auto& time : times)
+		{
+			ImGui::Text("%s: %.2fms", std::get<0>(time).c_str(), std::get<1>(time));
+		}
 	}
 	ImGui::End();
 }
diff --git a/src/UserInterface.hpp b/src/UserInterface.hpp
@@ -10,6 +10,7 @@ namespace Vulkan
 	class FrameBuffer;
 	class RenderPass;
 	class SwapChain;
+	class VulkanGpuTimer;
 }
 
 struct UserSettings;
@@ -18,6 +19,7 @@ struct Statistics final
 {
 	VkExtent2D FramebufferSize;
 	float FrameRate;
+	float FrameTime;
 	float RayRate;
 	uint32_t TotalSamples;
 	float CamPosX;
@@ -42,7 +44,7 @@ class UserInterface final
 		UserSettings& userSettings);
 	~UserInterface();
 
-	void Render(VkCommandBuffer commandBuffer, const Vulkan::FrameBuffer& frameBuffer, const Statistics& statistics);
+	void Render(VkCommandBuffer commandBuffer, const Vulkan::FrameBuffer& frameBuffer, const Statistics& statistics, Vulkan::VulkanGpuTimer* gpuTimer);
 
 	bool WantsToCaptureKeyboard() const;
 	bool WantsToCaptureMouse() const;
@@ -52,7 +54,7 @@ class UserInterface final
 private:
 
 	void DrawSettings();
-	void DrawOverlay(const Statistics& statistics);
+	void DrawOverlay(const Statistics& statistics, Vulkan::VulkanGpuTimer* gpuTimer);
 
 	std::unique_ptr<Vulkan::DescriptorPool> descriptorPool_;
 	std::unique_ptr<Vulkan::RenderPass> renderPass_;

diff --git a/src/Vulkan/Device.cpp b/src/Vulkan/Device.cpp
@@ -120,6 +120,8 @@ Device::Device(
 	vkGetDeviceQueue(device_, computeFamilyIndex_, 0, &computeQueue_);
 	vkGetDeviceQueue(device_, presentFamilyIndex_, 0, &presentQueue_);
 	//vkGetDeviceQueue(device_, transferFamilyIndex_, 0, &transferQueue_);
+
+    vkGetPhysicalDeviceProperties(PhysicalDevice(), &deviceProp_);
 }
 
 Device::~Device()

diff --git a/src/Vulkan/Device.hpp b/src/Vulkan/Device.hpp
@@ -38,6 +38,8 @@ namespace Vulkan
 		VkQueue PresentQueue() const { return presentQueue_; }
 		//VkQueue TransferQueue() const { return transferQueue_; }
 
+		VkPhysicalDeviceProperties DeviceProperties() const { return deviceProp_; }
+
 		void WaitIdle() const;
 
 	private:
@@ -60,6 +62,8 @@ namespace Vulkan
 		VkQueue computeQueue_{};
 		VkQueue presentQueue_{};
 		//VkQueue transferQueue_{};
+
+		VkPhysicalDeviceProperties deviceProp_;
 	};
 
 }
diff --git a/src/Vulkan/LegacyDeferred/LegacyDeferredRenderer.cpp b/src/Vulkan/LegacyDeferred/LegacyDeferredRenderer.cpp
@@ -150,54 +150,63 @@ void LegacyDeferredRenderer::Render(VkCommandBuffer commandBuffer, uint32_t imag
 	renderPassInfo.renderArea.extent = SwapChain().Extent();
 	renderPassInfo.clearValueCount = static_cast<uint32_t>(clearValues.size());
 	renderPassInfo.pClearValues = clearValues.data();
-
-	// make it to generate gbuffer
-	vkCmdBeginRenderPass(commandBuffer, &renderPassInfo, VK_SUBPASS_CONTENTS_INLINE);
+
 	{
-		const auto& scene = GetScene();
-
-		VkDescriptorSet descriptorSets[] = { gbufferPipeline_->DescriptorSet(imageIndex) };
-		VkBuffer vertexBuffers[] = { scene.VertexBuffer().Handle() };
-		const VkBuffer indexBuffer = scene.IndexBuffer().Handle();
-		VkDeviceSize offsets[] = { 0 };
-
-		vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, gbufferPipeline_->Handle());
-		vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, gbufferPipeline_->PipelineLayout().Handle(), 0, 1, descriptorSets, 0, nullptr);
-		vkCmdBindVertexBuffers(commandBuffer, 0, 1, vertexBuffers, offsets);
-		vkCmdBindIndexBuffer(commandBuffer, indexBuffer, 0, VK_INDEX_TYPE_UINT32);
-
-		// indirect draw
-		vkCmdDrawIndexedIndirect(commandBuffer, scene.IndirectDrawBuffer().Handle(), 0, scene.GetIndirectDrawBatchCount(), sizeof(VkDrawIndexedIndirectCommand));
-	}
-	vkCmdEndRenderPass(commandBuffer);
-
-	ImageMemoryBarrier::Insert(commandBuffer, outputImage_->Handle(), subresourceRange,
-					   0, VK_ACCESS_SHADER_WRITE_BIT, VK_IMAGE_LAYOUT_UNDEFINED,
+		SCOPED_GPU_TIMER("drawpass");
+		vkCmdBeginRenderPass(commandBuffer, &renderPassInfo, VK_SUBPASS_CONTENTS_INLINE);
+		{
+			const auto& scene = GetScene();
+
+			VkDescriptorSet descriptorSets[] = { gbufferPipeline_->DescriptorSet(imageIndex) };
+			VkBuffer vertexBuffers[] = { scene.VertexBuffer().Handle() };
+			const VkBuffer indexBuffer = scene.IndexBuffer().Handle();
+			VkDeviceSize offsets[] = { 0 };
+
+			vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, gbufferPipeline_->Handle());
+			vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, gbufferPipeline_->PipelineLayout().Handle(), 0, 1, descriptorSets, 0, nullptr);
+			vkCmdBindVertexBuffers(commandBuffer, 0, 1, vertexBuffers, offsets);
+			vkCmdBindIndexBuffer(commandBuffer, indexBuffer, 0, VK_INDEX_TYPE_UINT32);
+
+			// indirect draw
+			vkCmdDrawIndexedIndirect(commandBuffer, scene.IndirectDrawBuffer().Handle(), 0, scene.GetIndirectDrawBatchCount(), sizeof(VkDrawIndexedIndirectCommand));
+		}
+		vkCmdEndRenderPass(commandBuffer);
+
+		ImageMemoryBarrier::Insert(commandBuffer, outputImage_->Handle(), subresourceRange,
+				   0, VK_ACCESS_SHADER_WRITE_BIT, VK_IMAGE_LAYOUT_UNDEFINED,
+				   VK_IMAGE_LAYOUT_GENERAL);
+		ImageMemoryBarrier::Insert(commandBuffer, gbuffer0BufferImage_->Handle(), subresourceRange,
+						   VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
+						   VK_IMAGE_LAYOUT_GENERAL);
+		ImageMemoryBarrier::Insert(commandBuffer, gbuffer1BufferImage_->Handle(), subresourceRange,
+					   VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
 					   VK_IMAGE_LAYOUT_GENERAL);
-	ImageMemoryBarrier::Insert(commandBuffer, gbuffer0BufferImage_->Handle(), subresourceRange,
+		ImageMemoryBarrier::Insert(commandBuffer, gbuffer2BufferImage_->Handle(), subresourceRange,
 					   VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
 					   VK_IMAGE_LAYOUT_GENERAL);
-	ImageMemoryBarrier::Insert(commandBuffer, gbuffer1BufferImage_->Handle(), subresourceRange,
-				   VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
-				   VK_IMAGE_LAYOUT_GENERAL);
-	ImageMemoryBarrier::Insert(commandBuffer, gbuffer2BufferImage_->Handle(), subresourceRange,
-				   VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
-				   VK_IMAGE_LAYOUT_GENERAL);
-	// cs shading pass
-	VkDescriptorSet denoiserDescriptorSets[] = {deferredShadingPipeline_->DescriptorSet(imageIndex)};
-	vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, deferredShadingPipeline_->Handle());
-	vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE,
-							deferredShadingPipeline_->PipelineLayout().Handle(), 0, 1, denoiserDescriptorSets, 0, nullptr);
-	vkCmdDispatch(commandBuffer, SwapChain().Extent().width / 8 / ( CheckerboxRendering() ? 2 : 1 ), SwapChain().Extent().height / 4, 1);
+	}
 
-	// copy to swap-buffer
-	ImageMemoryBarrier::Insert(commandBuffer, outputImage_->Handle(), subresourceRange,
-						   VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT, VK_IMAGE_LAYOUT_GENERAL,
-						   VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
-
-	ImageMemoryBarrier::Insert(commandBuffer, SwapChain().Images()[imageIndex], subresourceRange, 0,
-							   VK_ACCESS_TRANSFER_WRITE_BIT, VK_IMAGE_LAYOUT_UNDEFINED,
-							   VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
+
+	{
+		SCOPED_GPU_TIMER("shadingpass");
+
+		// cs shading pass
+		VkDescriptorSet denoiserDescriptorSets[] = {deferredShadingPipeline_->DescriptorSet(imageIndex)};
+		vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, deferredShadingPipeline_->Handle());
+		vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE,
+								deferredShadingPipeline_->PipelineLayout().Handle(), 0, 1, denoiserDescriptorSets, 0, nullptr);
+		vkCmdDispatch(commandBuffer, SwapChain().Extent().width / 8 / ( CheckerboxRendering() ? 2 : 1 ), SwapChain().Extent().height / 4, 1);
+
+		// copy to swap-buffer
+		ImageMemoryBarrier::Insert(commandBuffer, outputImage_->Handle(), subresourceRange,
+							   VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT, VK_IMAGE_LAYOUT_GENERAL,
+							   VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
+
+		ImageMemoryBarrier::Insert(commandBuffer, SwapChain().Images()[imageIndex], subresourceRange, 0,
+								   VK_ACCESS_TRANSFER_WRITE_BIT, VK_IMAGE_LAYOUT_UNDEFINED,
+								   VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
+	}
+
 
 	// Copy output image into swap-chain image.
 	VkImageCopy copyRegion;