Software Renderer

CMakeLists.txt

@@ -1015,6 +1015,16 @@ add_library(GPU OBJECT
 	GPU/Math3D.h
 	GPU/Null/NullGpu.cpp
 	GPU/Null/NullGpu.h
+	GPU/Software/Clipper.cpp
+	GPU/Software/Clipper.h
+	GPU/Software/Lighting.cpp
+	GPU/Software/Lighting.h
+	GPU/Software/Rasterizer.cpp
+	GPU/Software/Rasterizer.h
+	GPU/Software/SoftGpu.cpp
+	GPU/Software/SoftGpu.h
+	GPU/Software/TransformUnit.cpp
+	GPU/Software/TransformUnit.h
 	GPU/ge_constants.h)
 setup_target_project(GPU GPU)
 

Core/Config.cpp

@@ -108,6 +108,7 @@ void Config::Load(const char *iniFileName)
 		1
 #endif
 		); // default is buffered rendering mode
+	graphics->Get("SoftwareRendering", &bSoftwareRendering, false);
 	graphics->Get("HardwareTransform", &bHardwareTransform, true);
 	graphics->Get("TextureFiltering", &iTexFiltering, 1);
 	graphics->Get("SSAA", &bAntiAliasing, 0);
@@ -242,6 +243,7 @@ void Config::Save()
 		graphics->Set("ShowFPSCounter", iShowFPSCounter);
 		graphics->Set("ResolutionScale", iWindowZoom);
 		graphics->Set("RenderingMode", iRenderingMode);
+		graphics->Set("SoftwareRendering", bSoftwareRendering);
 		graphics->Set("HardwareTransform", bHardwareTransform);
 		graphics->Set("TextureFiltering", iTexFiltering);
 		graphics->Set("SSAA", bAntiAliasing);

Core/Config.h

@@ -65,7 +65,8 @@ struct Config
 	std::string languageIni;
 
 	// GFX
-	bool bHardwareTransform;
+	bool bSoftwareRendering;
+	bool bHardwareTransform; // only used in the GLES backend
 	int iRenderingMode; // 0 = non-buffered rendering 1 = buffered rendering 2 = Read Framebuffer to memory (CPU) 3 = Read Framebuffer to memory (GPU)
 	int iTexFiltering; // 1 = off , 2 = nearest , 3 = linear , 4 = linear(CG)
 #ifdef BLACKBERRY

GPU/CMakeLists.txt

@@ -14,6 +14,11 @@ set(SRCS
 	GLES/VertexDecoder.cpp
 	GLES/VertexShaderGenerator.cpp
 	Null/NullGpu.cpp
+	Software/Clipper.cpp
+	Software/Lighting.cpp
+	Software/Rasterizer.cpp
+	Software/SoftGpu.cpp
+	Software/TransformUnit.cpp
 )
 
 set(SRCS ${SRCS})

GPU/GPU.vcxproj

@@ -158,6 +158,12 @@
     <ClInclude Include="GPUState.h" />
     <ClInclude Include="Math3D.h" />
     <ClInclude Include="Null\NullGpu.h" />
+    <ClInclude Include="Software\Clipper.h" />
+    <ClInclude Include="Software\Colors.h" />
+    <ClInclude Include="Software\Lighting.h" />
+    <ClInclude Include="Software\Rasterizer.h" />
+    <ClInclude Include="Software\SoftGpu.h" />
+    <ClInclude Include="Software\TransformUnit.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\ext\xbrz\xbrz.cpp" />
@@ -179,6 +185,11 @@
     <ClCompile Include="GPUState.cpp" />
     <ClCompile Include="Math3D.cpp" />
     <ClCompile Include="Null\NullGpu.cpp" />
+    <ClCompile Include="Software\Clipper.cpp" />
+    <ClCompile Include="Software\Lighting.cpp" />
+    <ClCompile Include="Software\Rasterizer.cpp" />
+    <ClCompile Include="Software\SoftGpu.cpp" />
+    <ClCompile Include="Software\TransformUnit.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Common\Common.vcxproj">
@@ -191,4 +202,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

GPU/GPU.vcxproj.filters

@@ -68,6 +68,24 @@
     <ClInclude Include="GLES\TextureScaler.h">
       <Filter>GLES</Filter>
     </ClInclude>
+    <ClInclude Include="Software\Colors.h">
+      <Filter>Software</Filter>
+    </ClInclude>
+    <ClInclude Include="Software\Clipper.h">
+      <Filter>Software</Filter>
+    </ClInclude>
+    <ClInclude Include="Software\Lighting.h">
+      <Filter>Software</Filter>
+    </ClInclude>
+    <ClInclude Include="Software\Rasterizer.h">
+      <Filter>Software</Filter>
+    </ClInclude>
+    <ClInclude Include="Software\SoftGpu.h">
+      <Filter>Software</Filter>
+    </ClInclude>
+    <ClInclude Include="Software\TransformUnit.h">
+      <Filter>Software</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Math3D.cpp">
@@ -117,8 +135,23 @@
     <ClCompile Include="GLES\TextureScaler.cpp">
       <Filter>GLES</Filter>
     </ClCompile>
+    <ClCompile Include="Software\Clipper.cpp">
+      <Filter>Software</Filter>
+    </ClCompile>
+    <ClCompile Include="Software\Lighting.cpp">
+      <Filter>Software</Filter>
+    </ClCompile>
+    <ClCompile Include="Software\Rasterizer.cpp">
+      <Filter>Software</Filter>
+    </ClCompile>
+    <ClCompile Include="Software\SoftGpu.cpp">
+      <Filter>Software</Filter>
+    </ClCompile>
+    <ClCompile Include="Software\TransformUnit.cpp">
+      <Filter>Software</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="CMakeLists.txt" />
   </ItemGroup>
-</Project>
+</Project>

GPU/GPUState.cpp

@@ -20,6 +20,7 @@
 #include "GLES/ShaderManager.h"
 #include "GLES/DisplayListInterpreter.h"
 #include "Null/NullGpu.h"
+#include "Software/SoftGpu.h"
 #include "../Core/CoreParameter.h"
 #include "../Core/System.h"
 
@@ -37,7 +38,7 @@ void GPU_Init() {
 		gpu = new GLES_GPU();
 		break;
 	case GPU_SOFTWARE:
-		gpu = new NullGPU();
+		gpu = new SoftGPU();
 		break;
 	}
 }

GPU/GPUState.h

@@ -211,6 +211,10 @@ struct GPUgstate
 	float tgenMatrix[12];
 	float boneMatrix[12 * 8];  // Eight bone matrices.
 
+	GEBufferFormat FrameBufFormat() const { return static_cast<GEBufferFormat>(framebufpixformat & 3); }
+	int FrameBufStride() const { return fbwidth&0x7C0; }
+	int DepthBufStride() const { return zbwidth&0x7C0; }
+
 	// Pixel Pipeline
 	bool isModeClear()   const { return clearmode & 1; }
 	bool isFogEnabled() const { return fogEnable & 1; }
@@ -221,6 +225,7 @@ struct GPUgstate
 	bool isClearModeDepthWriteEnabled() const { return (clearmode&0x400) != 0; }
 	bool isClearModeColorMask() const { return (clearmode&0x100) != 0; }
 	bool isClearModeAlphaMask() const { return (clearmode&0x200) != 0; }
+	u32 getClearModeColorMask() const { return ((clearmode&0x100) ? 0xFFFFFF : 0) | ((clearmode&0x200) ? 0xFF000000 : 0); } // TODO: Different convention than getColorMask, confusing!
 
 	// Blend
 	int getBlendFuncA() const { return blend & 0xF; }
@@ -322,10 +327,14 @@ struct GPUgstate
 	unsigned int getSpecularColorB(int chan) const { return (lcolor[2+chan*3]>>16)&0xFF; }
 
 	// UV gen
-	int getUVGenMode() const { return texmapmode & 3;}   // 2 bits
-	int getUVProjMode() const { return (texmapmode >> 8) & 3;}   // 2 bits
+	GETexMapMode getUVGenMode() const { return static_cast<GETexMapMode>(texmapmode & 3);}   // 2 bits
+	GETexProjMapMode getUVProjMode() const { return static_cast<GETexProjMapMode>((texmapmode >> 8) & 3);}   // 2 bits
 	int getUVLS0() const { return texshade & 0x3; }  // 2 bits
 	int getUVLS1() const { return (texshade >> 8) & 0x3; }  // 2 bits
+
+	bool isTexCoordClampedS() const { return texwrap & 1; }
+	bool isTexCoordClampedT() const { return (texwrap >> 8) & 1; }
+
 	int getScissorX1() const { return scissor1 & 0x3FF; }
 	int getScissorY1() const { return (scissor1 >> 10) & 0x3FF; }
 	int getScissorX2() const { return scissor2 & 0x3FF; }
@@ -341,6 +350,9 @@ struct GPUgstate
 	bool isModeThrough() const { return (vertType & GE_VTYPE_THROUGH) != 0; }
 	int getWeightMask() const { return vertType & GE_VTYPE_WEIGHT_MASK; }
 	int getNumBoneWeights() const { return 1 + ((vertType & GE_VTYPE_WEIGHTCOUNT_MASK) >> GE_VTYPE_WEIGHTCOUNT_SHIFT); }
+	bool isSkinningEnabled() const { return ((vertType & GE_VTYPE_WEIGHT_MASK) != GE_VTYPE_WEIGHT_NONE); }
+
+	GEPatchPrimType getPatchPrimitiveType() const { return static_cast<GEPatchPrimType>(patchprimitive & 3); }
 
 // Real data in the context ends here
 };