separate scene prepare and render

Author: malytomas

sources/include/cage-core/swapBufferGuard.h

@@ -44,10 +44,10 @@ namespace cage
 		public:
 			SwapBufferLock();
 			explicit SwapBufferLock(SwapBufferGuard *controller, uint32 index);
-			SwapBufferLock(SwapBufferLock &&other);
+			SwapBufferLock(SwapBufferLock &&other) noexcept;
 			~SwapBufferLock();
-			SwapBufferLock &operator=(SwapBufferLock &&other);
-			explicit operator bool() const { return !!controller_; }
+			SwapBufferLock &operator=(SwapBufferLock &&other) noexcept;
+			explicit operator bool() const noexcept { return !!controller_; }
 			uint32 index() const
 			{
 				CAGE_ASSERT(!!controller_);

sources/include/cage-engine/sceneCustomDraw.h

@@ -8,11 +8,13 @@ namespace cage
 	class Entity;
 	class GraphicsEncoder;
 	class GraphicsAggregateBuffer;
-	struct SceneRenderConfig;
+	struct ScenePrepareConfig;
+	struct SceneCameraConfig;
 
 	struct CAGE_ENGINE_API CustomDrawConfig
 	{
-		const SceneRenderConfig *renderConfig = nullptr;
+		const ScenePrepareConfig *sceneConfig = nullptr;
+		const SceneCameraConfig *cameraConfig = nullptr;
 		GraphicsEncoder *encoder = nullptr;
 		GraphicsAggregateBuffer *aggregate = nullptr;
 		Entity *entity = nullptr;

sources/include/cage-engine/sceneRender.h

@@ -12,27 +12,37 @@ namespace cage
 	class AssetsOnDemand;
 	class EntityManager;
 
-	struct CAGE_ENGINE_API SceneRenderConfig
+	struct CAGE_ENGINE_API ScenePrepareConfig
 	{
-		ScreenSpaceEffectsComponent effects;
-		Mat4 projection;
-		CameraCommonProperties camera;
-		Transform transform;
-		LodSelection lodSelection;
 		uint64 currentTime = 0;
 		uint64 elapsedTime = 1'000'000 / 60; // microseconds since last frame
-		Vec2i resolution;
 		GraphicsDevice *device = nullptr;
 		AssetsManager *assets = nullptr;
 		AssetsOnDemand *onDemand = nullptr;
 		EntityManager *scene = nullptr;
-		Texture *target = nullptr;
 		uint32 frameIndex = 0;
-		uint32 cameraSceneMask = 1;
 		Real interpolationFactor = 1;
 	};
 
-	CAGE_ENGINE_API Holder<PointerRange<Holder<GraphicsEncoder>>> sceneRender(const SceneRenderConfig &config);
+	struct CAGE_ENGINE_API SceneCameraConfig
+	{
+		Mat4 projection;
+		ScreenSpaceEffectsComponent effects;
+		CameraCommonProperties camera;
+		Transform transform;
+		LodSelection lodSelection;
+		Vec2i resolution;
+		Texture *target = nullptr;
+		uint32 cameraSceneMask = 1;
+	};
+
+	struct CAGE_ENGINE_API PreparedScene
+	{
+		const ScenePrepareConfig config;
+	};
+
+	CAGE_ENGINE_API Holder<PreparedScene> scenePrepare(const ScenePrepareConfig &config);
+	CAGE_ENGINE_API Holder<PointerRange<Holder<GraphicsEncoder>>> sceneRender(const PreparedScene *scene, const SceneCameraConfig &config);
 }
 
 #endif // guard_sceneRender_h_4hg1s8596drfh4

sources/libcore/swapBufferGuard.cpp

@@ -136,7 +136,7 @@ namespace cage
 			CAGE_ASSERT(impl->states[index] == StateEnum::Reading || impl->states[index] == StateEnum::Writing);
 		}
 
-		SwapBufferLock::SwapBufferLock(SwapBufferLock &&other) : controller_(nullptr), index_(m)
+		SwapBufferLock::SwapBufferLock(SwapBufferLock &&other) noexcept : controller_(nullptr), index_(m)
 		{
 			std::swap(controller_, other.controller_);
 			std::swap(index_, other.index_);
@@ -150,7 +150,7 @@ namespace cage
 			impl->finished(index_);
 		}
 
-		SwapBufferLock &SwapBufferLock::operator=(SwapBufferLock &&other)
+		SwapBufferLock &SwapBufferLock::operator=(SwapBufferLock &&other) noexcept
 		{
 			if (controller_)
 			{

sources/libengine/graphics/device.cpp

@@ -261,8 +261,8 @@ namespace cage
 					"vulkan_use_dynamic_rendering", //
 					"wait_is_thread_safe", // just to be sure
 				};
-				if (!config.vsync)
-					toggles.push_back("turn_off_vsync");
+				//if (!config.vsync)
+				//	toggles.push_back("turn_off_vsync");
 #ifdef CAGE_DEPLOY
 				toggles.push_back("disable_robustness");
 				toggles.push_back("skip_validation");
@@ -361,16 +361,27 @@ namespace cage
 				if (!context->surface.GetCapabilities(adapter, &capabilities))
 					CAGE_THROW_ERROR(Exception, "failed to retrieve surface capabilities");
 
-				bool relaxed = false;
+				//bool relaxed = false;
+				bool mailbox = false;
+				bool immediate = false;
 				for (uint32 i = 0; i < capabilities.presentModeCount; i++)
-					if (capabilities.presentModes[i] == wgpu::PresentMode::FifoRelaxed)
-						relaxed = true;
+				{
+					//if (capabilities.presentModes[i] == wgpu::PresentMode::FifoRelaxed)
+					//	relaxed = true;
+					if (capabilities.presentModes[i] == wgpu::PresentMode::Mailbox)
+						mailbox = true;
+					if (capabilities.presentModes[i] == wgpu::PresentMode::Immediate)
+						immediate = true;
+				}
 
 				wgpu::SurfaceConfiguration cfg = {};
 				cfg.device = device;
 				cfg.width = resolution[0];
 				cfg.height = resolution[1];
-				cfg.presentMode = relaxed ? wgpu::PresentMode::FifoRelaxed : wgpu::PresentMode::Fifo;
+				if (config.vsync)
+					cfg.presentMode = wgpu::PresentMode::Fifo;
+				else
+					cfg.presentMode = mailbox ? wgpu::PresentMode::Mailbox : immediate ? wgpu::PresentMode::Immediate : wgpu::PresentMode::Fifo;
 				cfg.format = wgpu::TextureFormat::BGRA8Unorm; // this should be guaranteed to work everywhere
 				cfg.usage = wgpu::TextureUsage::RenderAttachment | wgpu::TextureUsage::CopySrc;
 				context->surface.Configure(&cfg);