Merge branch 'dev'

gameknife · gameknife · commit f3a2ec57ec93 · 2024-10-06T22:45:51.000+08:00
diff --git a/assets/models/qx50.glb b/assets/models/qx50.glb
diff --git a/assets/shaders/Accumulate.comp b/assets/shaders/Accumulate.comp
@@ -42,14 +42,14 @@ void main() {
 
     vec4 src = imageLoad(NewSourceImage, ipos);
 
-    bool isEvenFrame = Camera.TotalFrames % 2 == 0;
+    bool isEvenFrame = Camera.TotalFrames % 2 == 0 ? true : false;
 
     bool useHistory = true;
     vec4 final = src;
     vec2 motion = imageLoad(MotionVectorImage, ipos).rg;
 	ivec2 previpos = ivec2( floor(ipos + motion) );
-	const bool inside = all(lessThan(previpos, ivec2(Camera.ViewportRect.xy + Camera.ViewportRect.zw))) && all(greaterThanEqual(previpos, ivec2(Camera.ViewportRect.xy)));
-    const bool check = length(motion) > 0.01;
+	const bool inside = all(lessThan(previpos, ivec2(Camera.ViewportRect.xy + Camera.ViewportRect.zw))) && all(greaterThanEqual(previpos, ivec2(Camera.ViewportRect.xy) + ivec2(-1,-1)));
+    const bool check = length(motion) > 0.01 ? true : false;
     // fetch visibility to validate the history
     uint current_primitive_index = isEvenFrame ? imageLoad(VisibilityBuffer, ipos).r : imageLoad(Visibility1Buffer, ipos).r;
     if(Camera.TotalFrames == 0 || !inside)
@@ -127,14 +127,17 @@ void main() {
         imageStore(AccumulateImage, ipos, final);
     }
 
-	uint realInstanceId = FetchPrimitiveIndex(current_primitive_index);
-	if(realInstanceId == Camera.SelectedId)
+	if(Camera.ShowEdge)
 	{
-		if( EdgeDetect(current_primitive_index, isEvenFrame, ipos ) )
+		uint realInstanceId = FetchPrimitiveIndex(current_primitive_index);
+		if(realInstanceId == Camera.SelectedId)
 		{
-			//final.rgb = vec3(1,0.05,0) * Camera.PaperWhiteNit;
+			if( EdgeDetect(current_primitive_index, isEvenFrame, ipos ) )
+			{
+				final.rgb = vec3(1,1,0.05) * Camera.PaperWhiteNit;
+			}
 		}
 	}
-
+	
     imageStore(OutImage, ipos, vec4( final.rgb, 1.0 ));
 }
diff --git a/assets/shaders/Compose.comp b/assets/shaders/Compose.comp
diff --git a/assets/shaders/common/UniformBufferObject.glsl b/assets/shaders/common/UniformBufferObject.glsl
@@ -43,6 +43,7 @@ struct UniformBufferObject
 	uint AdaptiveSteps;
 	glbool TAA;
 	uint SelectedId;
+	glbool ShowEdge;
 		
 	float BFSigma;
 	float BFSigmaLum;
diff --git a/src/Options.cpp b/src/Options.cpp
@@ -23,7 +23,7 @@ Options::Options(const int argc, const char* argv[])
 		("bounces", value<uint32_t>(&Bounces)->default_value(4), "The general limit number of bounces per ray.")
 		("max-bounces", value<uint32_t>(&MaxBounces)->default_value(10), "The maximum bounces per ray.")
 		("temporal", value<uint32_t>(&Temporal)->default_value(32), "The number of temporal frames.")
-		("denoiser", bool_switch(&Denoiser)->default_value(true), "Use Denoiser.")
+		("nodenoiser", bool_switch(&NoDenoiser)->default_value(false), "Not Use Denoiser.")
 		("adaptivesample", bool_switch(&AdaptiveSample)->default_value(false), "use adaptive sample to improve render quality.")
 	
     ;
diff --git a/src/Options.hpp b/src/Options.hpp
@@ -24,7 +24,7 @@ class Options final
 	bool Benchmark{};
 	bool SaveFile{};
 	bool RenderDoc{};
-	bool Denoiser{};
+	bool NoDenoiser{};
 	bool ForceSDR{};
 	std::string locale{};
 	
diff --git a/src/Runtime/Application.cpp b/src/Runtime/Application.cpp
@@ -134,15 +134,15 @@ UserSettings CreateUserSettings(const Options& options)
     userSettings.UseCheckerBoardRendering = false;
     userSettings.TemporalFrames = options.Benchmark ? 256 : options.Temporal;
 
-    userSettings.Denoiser = options.Denoiser;
+    userSettings.Denoiser = options.Benchmark ? false : !options.NoDenoiser;
 
     userSettings.PaperWhiteNit = 600.f;
 
     userSettings.SunRotation = 0.5f;
     userSettings.SunLuminance = 500.f;
     userSettings.SkyIntensity = 100.f;
     
-    userSettings.AutoFocus = false;
+    userSettings.RequestRayCast = false;
 
     userSettings.DenoiseSigma = 0.5f;
     userSettings.DenoiseSigmaLum = 10.0f;
@@ -341,7 +341,7 @@ Assets::UniformBufferObject NextRendererApplication::GetUniformBufferObject(cons
         Assets::RayCastResult rayResult {};
         renderer_->GetLastRaycastResult(rayResult);
     
-        if( userSettings_.AutoFocus )
+        if( userSettings_.RequestRayCast )
         {
             if(rayResult.Hitted )
             {
@@ -354,7 +354,7 @@ Assets::UniformBufferObject NextRendererApplication::GetUniformBufferObject(cons
             }
 
             // only active one frame
-            userSettings_.AutoFocus = false;
+            userSettings_.RequestRayCast = false;
         }
 
         userSettings_.HitResult = rayResult;
@@ -399,6 +399,11 @@ Assets::UniformBufferObject NextRendererApplication::GetUniformBufferObject(cons
     ubo.BFSigmaNormal = userSettings_.DenoiseSigmaNormal;
     ubo.BFSize = userSettings_.Denoiser ? userSettings_.DenoiseSize : 0;
 
+#if WITH_EDITOR
+    ubo.ShowEdge = true;
+#endif
+    
+
     // Other Setup
     renderer_->supportDenoiser_ = userSettings_.Denoiser;
     renderer_->visualDebug_ = userSettings_.ShowVisualDebug;
@@ -504,7 +509,7 @@ void NextRendererApplication::OnRendererPostRender(VkCommandBuffer commandBuffer
 
     //Renderer::visualDebug_ = userSettings_.ShowVisualDebug;
     
-    userInterface_->Render(commandBuffer, imageIndex, stats, renderer_->GpuTimer(), scene_.get());
+    userInterface_->Render(commandBuffer, renderer_->SwapChain(), imageIndex, stats, renderer_->GpuTimer(), scene_.get());
 }
 
 void NextRendererApplication::OnKey(int key, int scancode, int action, int mods)
@@ -593,7 +598,7 @@ void NextRendererApplication::OnMouseButton(const int button, const int action,
     {
         if( glm::distance(pressMousePos_, mousePos_) < 1.0f )
         {
-            userSettings_.AutoFocus = true;
+            userSettings_.RequestRayCast = true;
         }
     }
 #endif
diff --git a/src/Runtime/UserInterface.cpp b/src/Runtime/UserInterface.cpp
@@ -127,7 +127,6 @@ UserInterface::UserInterface(
 	const Vulkan::DepthBuffer& depthBuffer,
 	UserSettings& userSettings,
 	Vulkan::RenderImage& viewportImage) :
-	swapChain_(swapChain),
 	userSettings_(userSettings)
 	
 {
@@ -197,8 +196,6 @@ UserInterface::UserInterface(
     const auto scaleFactor = window.ContentScale();
 #endif
 
-
-	//ImGui::StyleColorsDark();
 	MainWindowStyle();
 	ImGui::GetStyle().ScaleAllSizes(scaleFactor);
 
@@ -398,7 +395,7 @@ void UserInterface::ToolbarUI()
 	ImGui::End();
 }
 
-void UserInterface::Render(VkCommandBuffer commandBuffer, uint32_t imageIdx, const Statistics& statistics, Vulkan::VulkanGpuTimer* gpuTimer, Assets::Scene* scene)
+void UserInterface::Render(VkCommandBuffer commandBuffer, const Vulkan::SwapChain& swapChain, uint32_t imageIdx, const Statistics& statistics, Vulkan::VulkanGpuTimer* gpuTimer, Assets::Scene* scene)
 {
 	GUserInterface = this;
 
@@ -427,7 +424,7 @@ void UserInterface::Render(VkCommandBuffer commandBuffer, uint32_t imageIdx, con
 	ImGuiID id = DockSpaceUI();
 	ToolbarUI();
 	ImGuiDockNode* node = ImGui::DockBuilderGetCentralNode(id);
-	swapChain_.UpdateEditorViewport(Utilities::Math::floorToInt(node->Pos.x - viewport->Pos.x), Utilities::Math::floorToInt(node->Pos.y - viewport->Pos.y), Utilities::Math::ceilToInt(node->Size.x), Utilities::Math::ceilToInt(node->Size.y));
+	swapChain.UpdateEditorViewport(Utilities::Math::floorToInt(node->Pos.x - viewport->Pos.x), Utilities::Math::floorToInt(node->Pos.y - viewport->Pos.y), Utilities::Math::ceilToInt(node->Size.x), Utilities::Math::ceilToInt(node->Size.y));
 	MainWindowGUI(*editorGUI_, scene, statistics, id, firstRun);
 #else
 	DrawSettings();
diff --git a/src/Runtime/UserInterface.hpp b/src/Runtime/UserInterface.hpp
@@ -67,7 +67,7 @@ class UserInterface final
 		Vulkan::RenderImage& viewportImage);
 	~UserInterface();
 
-	void Render(VkCommandBuffer commandBuffer, uint32_t imageIdx, const Statistics& statistics, Vulkan::VulkanGpuTimer* gpuTimer, Assets::Scene* scene);
+	void Render(VkCommandBuffer commandBuffer, const Vulkan::SwapChain& swapChain, uint32_t imageIdx, const Statistics& statistics, Vulkan::VulkanGpuTimer* gpuTimer, Assets::Scene* scene);
 
 	bool WantsToCaptureKeyboard() const;
 	bool WantsToCaptureMouse() const;
@@ -85,7 +85,6 @@ class UserInterface final
 	ImGuiID DockSpaceUI();
 	void ToolbarUI();
 	
-	const Vulkan::SwapChain& swapChain_;
 	void DrawSettings();
 	void DrawOverlay(const Statistics& statistics, Vulkan::VulkanGpuTimer* gpuTimer);
 	void DrawIndicator(uint32_t frameCount);
diff --git a/src/Runtime/UserSettings.hpp b/src/Runtime/UserSettings.hpp
@@ -32,7 +32,7 @@ struct UserSettings final
 	float RawFieldOfView;
 	float Aperture;
 	float FocusDistance;
-	bool AutoFocus;
+	bool RequestRayCast;
 
 	float SkyRotation;
 	float SunRotation;
diff --git a/src/Vulkan/RayQuery/RayQueryRenderer.cpp b/src/Vulkan/RayQuery/RayQueryRenderer.cpp
@@ -187,7 +187,7 @@ namespace Vulkan::RayTracing
             vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, accumulatePipeline_->Handle());
             vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE,
                                     accumulatePipeline_->PipelineLayout().Handle(), 0, 1, DescriptorSets, 0, nullptr);
-            vkCmdDispatch(commandBuffer, SwapChain().RenderExtent().width / 8, SwapChain().RenderExtent().height / 4, 1);
+            vkCmdDispatch(commandBuffer, Utilities::Math::GetSafeDispatchCount(SwapChain().RenderExtent().width, 8), Utilities::Math::GetSafeDispatchCount(SwapChain().RenderExtent().width, 4), 1);
         }
 
         {
@@ -221,7 +221,7 @@ namespace Vulkan::RayTracing
                 vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, composePipelineNonDenoiser_->Handle());
                 vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE,
                                         composePipelineNonDenoiser_->PipelineLayout().Handle(), 0, 1, DescriptorSets, 0, nullptr);
-                vkCmdDispatch(commandBuffer, SwapChain().RenderExtent().width / 16, SwapChain().RenderExtent().height / 16, 1);
+                vkCmdDispatch(commandBuffer, Utilities::Math::GetSafeDispatchCount(SwapChain().RenderExtent().width, 16), Utilities::Math::GetSafeDispatchCount(SwapChain().RenderExtent().width, 16), 1);
             }
             
             ImageMemoryBarrier::Insert(commandBuffer, SwapChain().Images()[imageIndex], subresourceRange,
@@ -264,6 +264,7 @@ namespace Vulkan::RayTracing
         }
     
 #if !ANDROID
+        if(supportRayCast_)
         {
             SCOPED_GPU_TIMER("raycast");
             
@@ -273,7 +274,7 @@ namespace Vulkan::RayTracing
                                     raycastPipeline_->PipelineLayout().Handle(), 0, 1, DescriptorSets, 0, nullptr);
             vkCmdDispatch(commandBuffer, 1, 1, 1);
         }
-
+#if WITH_OIDN
         if (supportDenoiser_)
         {
             VkImageSubresourceRange subresourceRange = {};
@@ -307,6 +308,7 @@ namespace Vulkan::RayTracing
                                        VK_IMAGE_LAYOUT_GENERAL);
         }
 #endif
+#endif
 
         
     }
diff --git a/src/Vulkan/RayTracing/RayTraceBaseRenderer.cpp b/src/Vulkan/RayTracing/RayTraceBaseRenderer.cpp
@@ -45,6 +45,7 @@ namespace Vulkan::RayTracing
                              const bool enableValidationLayers) :
         Vulkan::VulkanBaseRenderer(window, presentMode, enableValidationLayers)
     {
+        supportRayCast_ = true;
     }
 
     RayTraceBaseRenderer::~RayTraceBaseRenderer()
@@ -150,9 +151,16 @@ namespace Vulkan::RayTracing
     {
         VulkanBaseRenderer::AfterRenderCmd();
 
-        rayCastBuffer_->SetContext(cameraCenterCastContext_);
-        rayCastBuffer_->SyncWithGPU();
-        cameraCenterCastResult_ = rayCastBuffer_->GetResult();
+        if(supportRayCast_)
+        {
+            rayCastBuffer_->SetContext(cameraCenterCastContext_);
+            rayCastBuffer_->SyncWithGPU();
+            cameraCenterCastResult_ = rayCastBuffer_->GetResult();
+        }
+        else
+        {
+            cameraCenterCastResult_ = Assets::RayCastResult();
+        }
     }
 
 
diff --git a/src/Vulkan/VulkanBaseRenderer.hpp b/src/Vulkan/VulkanBaseRenderer.hpp
@@ -303,6 +303,7 @@ namespace Vulkan
 		bool checkerboxRendering_{};
 		bool supportRayTracing_ {};
 		bool supportDenoiser_ {};
+		bool supportRayCast_ {};
 		int frameCount_{};
 		bool forceSDR_{};
 		bool visualDebug_{};

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ Options::Options(const int argc, const char* argv[])`
`23`	`23`	`("bounces", value<uint32_t>(&Bounces)->default_value(4), "The general limit number of bounces per ray.")`
`24`	`24`	`("max-bounces", value<uint32_t>(&MaxBounces)->default_value(10), "The maximum bounces per ray.")`
`25`	`25`	`("temporal", value<uint32_t>(&Temporal)->default_value(32), "The number of temporal frames.")`
`26`		`- ("denoiser", bool_switch(&Denoiser)->default_value(true), "Use Denoiser.")`
	`26`	`+ ("nodenoiser", bool_switch(&NoDenoiser)->default_value(false), "Not Use Denoiser.")`
`27`	`27`	`("adaptivesample", bool_switch(&AdaptiveSample)->default_value(false), "use adaptive sample to improve render quality.")`
`28`	`28`
`29`	`29`	`;`
Original file line number	Diff line number	Diff line change
`@@ -134,15 +134,15 @@ UserSettings CreateUserSettings(const Options& options)`
`134`	`134`	`userSettings.UseCheckerBoardRendering = false;`
`135`	`135`	`userSettings.TemporalFrames = options.Benchmark ? 256 : options.Temporal;`
`136`	`136`
`137`		`- userSettings.Denoiser = options.Denoiser;`
	`137`	`+ userSettings.Denoiser = options.Benchmark ? false : !options.NoDenoiser;`
`138`	`138`
`139`	`139`	`userSettings.PaperWhiteNit = 600.f;`
`140`	`140`
`141`	`141`	`userSettings.SunRotation = 0.5f;`
`142`	`142`	`userSettings.SunLuminance = 500.f;`
`143`	`143`	`userSettings.SkyIntensity = 100.f;`
`144`	`144`
`145`		`- userSettings.AutoFocus = false;`
	`145`	`+ userSettings.RequestRayCast = false;`
`146`	`146`
`147`	`147`	`userSettings.DenoiseSigma = 0.5f;`
`148`	`148`	`userSettings.DenoiseSigmaLum = 10.0f;`
`@@ -341,7 +341,7 @@ Assets::UniformBufferObject NextRendererApplication::GetUniformBufferObject(cons`
`341`	`341`	`Assets::RayCastResult rayResult {};`
`342`	`342`	`renderer_->GetLastRaycastResult(rayResult);`
`343`	`343`
`344`		`- if( userSettings_.AutoFocus )`
	`344`	`+ if( userSettings_.RequestRayCast )`
`345`	`345`	`{`
`346`	`346`	`if(rayResult.Hitted )`
`347`	`347`	`{`
`@@ -354,7 +354,7 @@ Assets::UniformBufferObject NextRendererApplication::GetUniformBufferObject(cons`
`354`	`354`	`}`
`355`	`355`
`356`	`356`	`// only active one frame`
`357`		`- userSettings_.AutoFocus = false;`
	`357`	`+ userSettings_.RequestRayCast = false;`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`userSettings_.HitResult = rayResult;`
`@@ -399,6 +399,11 @@ Assets::UniformBufferObject NextRendererApplication::GetUniformBufferObject(cons`
`399`	`399`	`ubo.BFSigmaNormal = userSettings_.DenoiseSigmaNormal;`
`400`	`400`	`ubo.BFSize = userSettings_.Denoiser ? userSettings_.DenoiseSize : 0;`
`401`	`401`
	`402`	`+#if WITH_EDITOR`
	`403`	`+ ubo.ShowEdge = true;`
	`404`	`+#endif`
	`405`	`+`
	`406`	`+`
`402`	`407`	`// Other Setup`
`403`	`408`	`renderer_->supportDenoiser_ = userSettings_.Denoiser;`
`404`	`409`	`renderer_->visualDebug_ = userSettings_.ShowVisualDebug;`
`@@ -504,7 +509,7 @@ void NextRendererApplication::OnRendererPostRender(VkCommandBuffer commandBuffer`
`504`	`509`
`505`	`510`	`//Renderer::visualDebug_ = userSettings_.ShowVisualDebug;`
`506`	`511`
`507`		`- userInterface_->Render(commandBuffer, imageIndex, stats, renderer_->GpuTimer(), scene_.get());`
	`512`	`+ userInterface_->Render(commandBuffer, renderer_->SwapChain(), imageIndex, stats, renderer_->GpuTimer(), scene_.get());`
`508`	`513`	`}`
`509`	`514`
`510`	`515`	`void NextRendererApplication::OnKey(int key, int scancode, int action, int mods)`
`@@ -593,7 +598,7 @@ void NextRendererApplication::OnMouseButton(const int button, const int action,`
`593`	`598`	`{`
`594`	`599`	`if( glm::distance(pressMousePos_, mousePos_) < 1.0f )`
`595`	`600`	`{`
`596`		`- userSettings_.AutoFocus = true;`
	`601`	`+ userSettings_.RequestRayCast = true;`
`597`	`602`	`}`
`598`	`603`	`}`
`599`	`604`	`#endif`