Move parameter reading to routine constructor.

src/Android.mk

@@ -55,7 +55,6 @@ COMMON_SRC_FILES += \
 	Renderer/Plane.cpp \
 	Renderer/Point.cpp \
 	Renderer/QuadRasterizer.cpp \
-	Renderer/Rasterizer.cpp \
 	Renderer/Renderer.cpp \
 	Renderer/Sampler.cpp \
 	Renderer/SetupProcessor.cpp \

src/OpenGL/libGLES_CM/libGLES_CM.cbp

@@ -214,7 +214,6 @@
 		<Unit filename="../../Renderer/Primitive.hpp" />
 		<Unit filename="../../Renderer/QuadRasterizer.cpp" />
 		<Unit filename="../../Renderer/QuadRasterizer.hpp" />
-		<Unit filename="../../Renderer/Rasterizer.cpp" />
 		<Unit filename="../../Renderer/Rasterizer.hpp" />
 		<Unit filename="../../Renderer/Renderer.cpp" />
 		<Unit filename="../../Renderer/Renderer.hpp" />

src/OpenGL/libGLESv2/libGLESv2.cbp

@@ -213,7 +213,6 @@
 		<Unit filename="../../Renderer/Primitive.hpp" />
 		<Unit filename="../../Renderer/QuadRasterizer.cpp" />
 		<Unit filename="../../Renderer/QuadRasterizer.hpp" />
-		<Unit filename="../../Renderer/Rasterizer.cpp" />
 		<Unit filename="../../Renderer/Rasterizer.hpp" />
 		<Unit filename="../../Renderer/Renderer.cpp" />
 		<Unit filename="../../Renderer/Renderer.hpp" />

src/Renderer/PixelProcessor.cpp

@@ -1095,7 +1095,7 @@ namespace sw
 		if(!routine)
 		{
 			const bool integerPipeline = (context->pixelShaderVersion() <= 0x0104);
-			Rasterizer *generator = nullptr;
+			QuadRasterizer *generator = nullptr;
 
 			if(integerPipeline)
 			{

src/Renderer/QuadRasterizer.cpp

@@ -25,7 +25,7 @@ namespace sw
 
 	extern int clusterCount;
 
-	QuadRasterizer::QuadRasterizer(const PixelProcessor::State &state, const PixelShader *pixelShader) : Rasterizer(state), shader(pixelShader)
+	QuadRasterizer::QuadRasterizer(const PixelProcessor::State &state, const PixelShader *pixelShader) : state(state), shader(pixelShader)
 	{
 	}
 
@@ -44,11 +44,6 @@ namespace sw
 			Long pixelTime = Ticks();
 		#endif
 
-		primitive = Arg<0>();
-		Int count = Arg<1>();
-		Int cluster = Arg<2>();
-		data = Arg<3>();
-
 		constants = *Pointer<Pointer<Byte>>(data + OFFSET(DrawData,constants));
 		occlusion = 0;
 

src/Renderer/QuadRasterizer.hpp

@@ -22,14 +22,15 @@ namespace sw
 {
 	class QuadRasterizer : public Rasterizer
 	{
-	protected:
+	public:
 		QuadRasterizer(const PixelProcessor::State &state, const PixelShader *shader);
-
 		virtual ~QuadRasterizer();
 
+		void generate();
+
+	protected:
+
 		Pointer<Byte> constants;
-		Pointer<Byte> primitive;
-		Pointer<Byte> data;
 
 		Float4 Dz[4];
 		Float4 Dw;
@@ -48,11 +49,10 @@ namespace sw
 		bool interpolateW() const;
 		Float4 interpolate(Float4 &x, Float4 &D, Float4 &rhw, Pointer<Byte> planeEquation, bool flat, bool perspective);
 
+		const PixelProcessor::State &state;
 		const PixelShader *const shader;
 
 	private:
-		void generate();
-
 		void rasterize(Int &yMin, Int &yMax);
 	};
 }

src/Renderer/Rasterizer.cpp

-// SwiftShader Software Renderer
-//
-// Copyright(c) 2005-2011 TransGaming Inc.
-//
-// All rights reserved. No part of this software may be copied, distributed, transmitted,
-// transcribed, stored in a retrieval system, translated into any human or computer
-// language by any means, or disclosed to third parties without the explicit written
-// agreement of TransGaming Inc. Without such an agreement, no rights or licenses, express
-// or implied, including but not limited to any patent rights, are granted to you.
-//
-
-#include "Rasterizer.hpp"
-
-namespace sw
-{
-	Rasterizer::Rasterizer(const PixelProcessor::State &state) : state(state)
-	{
-	}
-
-	Rasterizer::~Rasterizer()
-	{
-	}
-}

src/Renderer/Rasterizer.hpp

@@ -22,14 +22,14 @@ namespace sw
 	class Rasterizer : public Function<Void(Pointer<Byte>, Int, Int, Pointer<Byte>)>
 	{
 	public:
-		Rasterizer(const PixelProcessor::State &state);
-
-		virtual ~Rasterizer();
-
-		virtual void generate() = 0;
+		Rasterizer() : primitive(Arg<0>()), count(Arg<1>()), cluster(Arg<2>()), data(Arg<3>()) {}
+		virtual ~Rasterizer() {};
 
 	protected:
-		const PixelProcessor::State &state;
+		const Pointer<Byte> primitive;
+		const Int count;
+		const Int cluster;
+		const Pointer<Byte> data;
 	};
 }
 

src/SwiftShader/SwiftShader.vcxproj

@@ -362,7 +362,6 @@
       <PreprocessKeepComments Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</PreprocessKeepComments>
       <PreprocessKeepComments Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">false</PreprocessKeepComments>
     </ClCompile>
-    <ClCompile Include="..\Renderer\Rasterizer.cpp" />
     <ClCompile Include="..\Renderer\Renderer.cpp" />
     <ClCompile Include="..\Renderer\Sampler.cpp" />
     <ClCompile Include="..\Renderer\SetupProcessor.cpp" />

src/SwiftShader/SwiftShader.vcxproj.filters

@@ -95,9 +95,6 @@
     <ClCompile Include="..\Renderer\QuadRasterizer.cpp">
       <Filter>Source Files\Renderer</Filter>
     </ClCompile>
-    <ClCompile Include="..\Renderer\Rasterizer.cpp">
-      <Filter>Source Files\Renderer</Filter>
-    </ClCompile>
     <ClCompile Include="..\Renderer\Renderer.cpp">
       <Filter>Source Files\Renderer</Filter>
     </ClCompile>