Modify PixelRoutine to implement FunctionT

src/Device/PixelProcessor.cpp

@@ -147,7 +147,7 @@ namespace sw
 	void PixelProcessor::setRoutineCacheSize(int cacheSize)
 	{
 		delete routineCache;
-		routineCache = new RoutineCache<State>(clamp(cacheSize, 1, 65536));
+		routineCache = new RoutineCacheType(clamp(cacheSize, 1, 65536));
 	}
 
 	const PixelProcessor::State PixelProcessor::update(const Context* context) const
@@ -206,7 +206,7 @@ namespace sw
 		return state;
 	}
 
-	std::shared_ptr<Routine> PixelProcessor::routine(const State &state,
+	PixelProcessor::RoutineType PixelProcessor::routine(const State &state,
 		vk::PipelineLayout const *pipelineLayout,
 		SpirvShader const *pixelShader,
 		const vk::DescriptorSet::Bindings &descriptorSets)

src/Device/PixelProcessor.hpp

@@ -28,6 +28,8 @@ namespace sw
 	struct DrawData;
 	struct Primitive;
 
+	using RasterizerFunction = FunctionT<void(const Primitive* primitive, int count, int cluster, int clusterCount, DrawData* draw)>;
+
 	class PixelProcessor
 	{
 	public:
@@ -136,7 +138,7 @@ namespace sw
 		};
 
 	public:
-		typedef void (*RoutinePointer)(const Primitive *primitive, int count, int cluster, int clusterCount, DrawData *draw);
+		using RoutineType = RasterizerFunction::RoutineType;
 
 		PixelProcessor();
 
@@ -146,7 +148,7 @@ namespace sw
 
 	protected:
 		const State update(const Context* context) const;
-		std::shared_ptr<Routine> routine(const State &state, vk::PipelineLayout const *pipelineLayout,
+		RoutineType routine(const State &state, vk::PipelineLayout const *pipelineLayout,
 		                                 SpirvShader const *pixelShader, const vk::DescriptorSet::Bindings &descriptorSets);
 		void setRoutineCacheSize(int routineCacheSize);
 
@@ -154,7 +156,8 @@ namespace sw
 		Factor factor;
 
 	private:
-		RoutineCache<State> *routineCache;
+		using RoutineCacheType = RoutineCacheT<State, RasterizerFunction::CFunctionType>;
+		RoutineCacheType *routineCache;
 	};
 }
 

src/Device/Rasterizer.hpp

@@ -21,7 +21,7 @@
 
 namespace sw
 {
-	class Rasterizer : public Function<Void(Pointer<Byte>, Int, Int, Int, Pointer<Byte>)>
+	class Rasterizer : public RasterizerFunction
 	{
 	public:
 		Rasterizer() : primitive(Arg<0>()), count(Arg<1>()), cluster(Arg<2>()), clusterCount(Arg<3>()), data(Arg<4>()) {}

src/Device/Renderer.cpp

@@ -270,7 +270,6 @@ namespace sw
 		draw->setupRoutine = setupRoutine;
 		draw->pixelRoutine = pixelRoutine;
 		draw->setupPointer = (SetupProcessor::RoutinePointer)setupRoutine->getEntry();
-		draw->pixelPointer = (PixelProcessor::RoutinePointer)pixelRoutine->getEntry();
 		draw->setupPrimitives = setupPrimitives;
 		draw->setupState = setupState;
 
@@ -434,7 +433,7 @@ namespace sw
 
 		vertexRoutine = {};
 		setupRoutine.reset();
-		pixelRoutine.reset();
+		pixelRoutine = {};
 	}
 
 	void DrawCall::run(const marl::Loan<DrawCall>& draw, marl::Ticket::Queue* tickets, marl::Ticket::Queue clusterQueues[MaxClusterCount])
@@ -543,7 +542,7 @@ namespace sw
 				auto& draw = data->draw;
 				auto& batch = data->batch;
 				MARL_SCOPED_EVENT("PIXEL draw %d, batch %d, cluster %d", draw->id, batch->id, cluster);
-				draw->pixelPointer(&batch->primitives.front(), batch->numVisible, cluster, MaxClusterCount, draw->data);
+				draw->pixelRoutine(&batch->primitives.front(), batch->numVisible, cluster, MaxClusterCount, draw->data);
 				batch->clusterTickets[cluster].done();
 			});
 		}

src/Device/Renderer.hpp

@@ -156,10 +156,9 @@ namespace sw
 
 		VertexProcessor::RoutineType vertexRoutine;
 		std::shared_ptr<Routine> setupRoutine;
-		std::shared_ptr<Routine> pixelRoutine;
+		PixelProcessor::RoutineType pixelRoutine;
 
 		SetupProcessor::RoutinePointer setupPointer;
-		PixelProcessor::RoutinePointer pixelPointer;
 
 		SetupFunction setupPrimitives;
 		SetupProcessor::State setupState;
@@ -238,7 +237,7 @@ namespace sw
 
 		VertexProcessor::RoutineType vertexRoutine;
 		std::shared_ptr<Routine> setupRoutine;
-		std::shared_ptr<Routine> pixelRoutine;
+		PixelProcessor::RoutineType pixelRoutine;
 
 		vk::Device* device;
 	};