simplified render pipline api

Author: malytomas

sources/include/cage-engine/renderPipeline.h

@@ -13,60 +13,34 @@ namespace cage
 	class ProvisionalGraphics;
 	class AssetsOnDemand;
 
-	struct LodSelection
+	struct CAGE_ENGINE_API LodSelection
 	{
 		Vec3 center; // center of camera
 		Real screenSize = 0; // vertical size of screen in pixels, one meter in front of the camera
 		bool orthographic = false;
 	};
 
-	struct CAGE_ENGINE_API RenderPipelineCamera
+	struct CAGE_ENGINE_API RenderPipelineConfig
 	{
-		CameraCommonProperties camera;
-		ScreenSpaceEffectsComponent effects;
-		LodSelection lodSelection;
 		String name;
+		ScreenSpaceEffectsComponent effects;
 		Mat4 projection;
 		Transform transform;
 		TextureHandle target;
-		Vec2i resolution;
-	};
-
-	struct CAGE_ENGINE_API RenderPipelineDebugVisualization
-	{
-		TextureHandle texture;
-		Holder<ShaderProgram> shader;
-	};
-
-	struct CAGE_ENGINE_API RenderPipelineResult
-	{
-		Holder<PointerRange<RenderPipelineDebugVisualization>> debugVisualizations;
-		Holder<RenderQueue> renderQueue;
-	};
-
-	class CAGE_ENGINE_API RenderPipeline : private Immovable
-	{
-	public:
+		CameraCommonProperties camera;
+		LodSelection lodSelection;
 		uint64 currentTime = 0;
 		uint64 elapsedTime = 1000000 / 60; // microseconds since last frame
-		uint32 frameIndex = 0;
-		Real interpolationFactor = 1;
-
-		bool reinitialize();
-
-		// thread-safe: you may render multiple cameras simultaneously in threads
-		RenderPipelineResult render(const RenderPipelineCamera &camera);
-	};
-
-	struct CAGE_ENGINE_API RenderPipelineCreateConfig
-	{
+		Vec2i resolution;
 		AssetsManager *assets = nullptr;
 		ProvisionalGraphics *provisionalGraphics = nullptr;
 		EntityManager *scene = nullptr;
 		AssetsOnDemand *onDemand = nullptr;
+		uint32 frameIndex = 0;
+		Real interpolationFactor = 1;
 	};
 
-	CAGE_ENGINE_API Holder<RenderPipeline> newRenderPipeline(const RenderPipelineCreateConfig &config);
+	CAGE_ENGINE_API Holder<RenderQueue> renderPipeline(const RenderPipelineConfig &config);
 }
 
 #endif // guard_renderPipeline_h_4hg1s8596drfh4

sources/include/cage-engine/renderQueue.h

@@ -109,6 +109,20 @@ namespace cage
 		void genericEnable(uint32 key, bool enable);
 		void resetAllState(); // set viewport, scissors, culling, depth, blend etc all to default values
 
+		template<class T>
+		void customCommand(Holder<T> data)
+		{
+			using Fnc = void(void *);
+			static Fnc *fnc = +[](void *d) { (*(T *)d)(); };
+			_customCommand(std::move(data).cast<void>(), fnc);
+		}
+		template<class T>
+		void customCommand(Holder<T> data, void fnc(T *))
+		{
+			using Fnc = void(void *);
+			_customCommand(std::move(data).cast<void>(), (Fnc *)fnc);
+		}
+
 		[[nodiscard]] struct RenderQueueNamedScope namedScope(StringPointer name);
 
 		// dispatch another queue as part of this queue
@@ -129,6 +143,9 @@ namespace cage
 		uint32 commandsCount() const;
 		uint32 drawsCount() const;
 		uint32 primitivesCount() const;
+
+	private:
+		void _customCommand(Holder<void> data, void (*fnc)(void *));
 	};
 
 	CAGE_ENGINE_API Holder<RenderQueue> newRenderQueue(const String &name, ProvisionalGraphics *provisionalGraphics);

sources/include/cage-engine/virtualReality.h

@@ -57,6 +57,9 @@ namespace cage
 		// also submits acquired textures to the device
 		// requires opengl context
 		void renderCommit();
+
+		// requires opengl context
+		void renderCancel();
 	};
 
 	class CAGE_ENGINE_API VirtualReality : private Immovable

sources/include/cage-simple/statisticsGui.h

@@ -43,10 +43,8 @@ namespace cage
 		uint32 keyToggleStatisticsScope = 290; // f1
 		uint32 keyToggleStatisticsMode = 291; // f2
 		uint32 keyToggleProfilingEnabled = 292; // f3
-		uint32 keyVisualizeBufferPrev = 294; // f5
-		uint32 keyVisualizeBufferNext = 295; // f6
-		uint32 keyToggleRenderMissingModels = 296; // f7
-		uint32 keyToggleRenderSkeletonBones = 297; // f8
+		uint32 keyToggleRenderMissingModels = 294; // f5
+		uint32 keyToggleRenderSkeletonBones = 295; // f6
 		uint32 keyDecreaseGamma = 298; // f9
 		uint32 keyIncreaseGamma = 299; // f10
 		ModifiersFlags keyModifiers = ModifiersFlags::Ctrl;

sources/libcore/memory/memoryArena.cpp

@@ -1,4 +1,3 @@
-#include <atomic>
 #include <cstdlib>
 
 #include <cage-core/memoryArena.h>
@@ -76,7 +75,6 @@ namespace cage
 				void *tmp = malloca(size, alignment);
 				if (!tmp)
 					CAGE_THROW_ERROR(OutOfMemory, "system memory arena out of memory", size);
-				allocations++;
 				return tmp;
 			}
 
@@ -85,15 +83,11 @@ namespace cage
 				if (!ptr)
 					return;
 				freea(ptr);
-				if (allocations-- == 0)
-					CAGE_THROW_CRITICAL(Exception, "memory corruption - double deallocation detected");
 			}
 
 			void flush() { CAGE_THROW_CRITICAL(Exception, "invalid operation - deallocate must be used"); }
 
 			MemoryArena arena = MemoryArena(this);
-
-			std::atomic<uint32> allocations = 0;
 		};
 	}