softgpu: Pass in the right value for fog.

hrydgard · Nov 26, 2015 · 7a9bdee · 7a9bdee
1 parent 7bfe100
commit 7a9bdee
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/GPU/Software/Rasterizer.cpp b/GPU/Software/Rasterizer.cpp
@@ -1428,12 +1428,15 @@ void DrawPoint(const VertexData &v0)
 	DrawingCoords p = TransformUnit::ScreenToDrawing(pprime);
 	u16 z = pos.z;
 
-	u8 fog = ClampFogDepth(v0.fogdepth);
+	u8 fog = 255;
+	if (gstate.isFogEnabled() && !clearMode) {
+		fog = ClampFogDepth(v0.fogdepth);
+	}
 
 	if (clearMode) {
-		DrawSinglePixel<true>(p, z, v0.fogdepth, prim_color);
+		DrawSinglePixel<true>(p, z, fog, prim_color);
 	} else {
-		DrawSinglePixel<false>(p, z, v0.fogdepth, prim_color);
+		DrawSinglePixel<false>(p, z, fog, prim_color);
 	}
 }
 
@@ -1509,7 +1512,10 @@ void DrawLine(const VertexData &v0, const VertexData &v1)
 		Vec2<float> tc = (v0.texturecoords * (float)(steps - i) + v1.texturecoords * (float)i) / steps1;
 		Vec4<int> prim_color = c0;
 
-		// TODO: Interpolate fog as well
+		u8 fog = 255;
+		if (gstate.isFogEnabled() && !clearMode) {
+			fog = ClampFogDepth((v0.fogdepth * (float)(steps - i) + v1.fogdepth * (float)i) / steps1);
+		}
 
 		float s = tc.s();
 		float t = tc.t();
@@ -1532,9 +1538,9 @@ void DrawLine(const VertexData &v0, const VertexData &v1)
 
 		DrawingCoords p = TransformUnit::ScreenToDrawing(pprime);
 		if (clearMode) {
-			DrawSinglePixel<true>(p, z, v0.fogdepth, prim_color);
+			DrawSinglePixel<true>(p, z, fog, prim_color);
 		} else {
-			DrawSinglePixel<false>(p, z, v0.fogdepth, prim_color);
+			DrawSinglePixel<false>(p, z, fog, prim_color);
 		}
 
 		x = x + xinc;