diff --git a/GPU/Software/Clipper.cpp b/GPU/Software/Clipper.cpp
index 85fed84853..80a3ee9f8a 100644
--- a/GPU/Software/Clipper.cpp
+++ b/GPU/Software/Clipper.cpp
@@ -240,7 +240,33 @@ void ProcessLine(VertexData& v0, VertexData& v1)
 		return;
 	}
 
-	// TODO: 3D lines
+	VertexData *Vertices[2] = {&v0, &v1};
+
+	int mask0 = CalcClipMask(v0.clippos);
+	int mask1 = CalcClipMask(v1.clippos);
+	int mask = mask0 | mask1;
+
+	if (mask && (gstate.clipEnable & 0x1)) {
+		// discard if any vertex is outside the near clipping plane
+		if (mask & CLIP_NEG_Z_BIT)
+			return;
+
+		CLIP_LINE(CLIP_POS_X_BIT, -1,  0,  0, 1);
+		CLIP_LINE(CLIP_NEG_X_BIT,  1,  0,  0, 1);
+		CLIP_LINE(CLIP_POS_Y_BIT,  0, -1,  0, 1);
+		CLIP_LINE(CLIP_NEG_Y_BIT,  0,  1,  0, 1);
+		CLIP_LINE(CLIP_POS_Z_BIT,  0,  0,  0, 1);
+		CLIP_LINE(CLIP_NEG_Z_BIT,  0,  0,  1, 1);
+	} else if (mask0 & mask1) {
+		// If clipping is disabled, only discard the current primitive
+		// if both vertices lie outside one of the clipping planes
+		return;
+	}
+
+	VertexData data[2] = { *Vertices[0], *Vertices[1] };
+	data[0].screenpos = TransformUnit::ClipToScreen(data[0].clippos);
+	data[1].screenpos = TransformUnit::ClipToScreen(data[1].clippos);
+	Rasterizer::DrawLine(data[0], data[1]);
 }
 
 void ProcessTriangle(VertexData& v0, VertexData& v1, VertexData& v2)
diff --git a/GPU/Software/Rasterizer.cpp b/GPU/Software/Rasterizer.cpp
index fba5290170..39b71c8d28 100644
--- a/GPU/Software/Rasterizer.cpp
+++ b/GPU/Software/Rasterizer.cpp
@@ -1535,7 +1535,7 @@ void DrawPoint(const VertexData &v0)
 	ScreenCoords scissorTL(TransformUnit::DrawingToScreen(DrawingCoords(gstate.getScissorX1(), gstate.getScissorY1(), 0)));
 	ScreenCoords scissorBR(TransformUnit::DrawingToScreen(DrawingCoords(gstate.getScissorX2(), gstate.getScissorY2(), 0)));
 
-	if (pos.x < scissorTL.x || pos.y < scissorTL.y || pos.x >= scissorBR.x || pos.y >= scissorBR.y)
+	if (pos.x < scissorTL.x || pos.y < scissorTL.y || pos.x > scissorBR.x || pos.y > scissorBR.y)
 		return;
 
 	bool clearMode = gstate.isModeClear();
@@ -1655,48 +1655,48 @@ void DrawLine(const VertexData &v0, const VertexData &v1)
 	float z = a.z;
 	const int steps1 = steps == 0 ? 1 : steps;
 	for (int i = 0; i <= steps; i++) {
-		if (x < scissorTL.x || y < scissorTL.y || x >= scissorBR.x || y >= scissorBR.y)
-			continue;
+		if (x >= scissorTL.x && y >= scissorTL.y && x <= scissorBR.x && y <= scissorBR.y) {
+			// Interpolate between the two points.
+			// TODO: gstate.getShadeMode() == GE_SHADE_GOURAUD
+			Vec4<int> prim_color = (v0.color0 * (steps - i) + v1.color0 * i) / steps1;
+			Vec3<int> sec_color = (v0.color1 * (steps - i) + v1.color1 * i) / steps1;
+			// TODO: UVGenMode?
+			Vec2<float> tc = (v0.texturecoords * (float)(steps - i) + v1.texturecoords * (float)i) / steps1;
 
-		// Interpolate between the two points.
-		Vec4<int> c0 = (v0.color0 * (steps - i) + v1.color0 * i) / steps1;
-		Vec3<int> sec_color = (v0.color1 * (steps - i) + v1.color1 * i) / steps1;
-		// TODO: UVGenMode?
-		Vec2<float> tc = (v0.texturecoords * (float)(steps - i) + v1.texturecoords * (float)i) / steps1;
-		Vec4<int> prim_color = c0;
+			u8 fog = 255;
+			if (gstate.isFogEnabled() && !clearMode) {
+				fog = ClampFogDepth((v0.fogdepth * (float)(steps - i) + v1.fogdepth * (float)i) / steps1);
+			}
 
-		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();
 
-		float s = tc.s();
-		float t = tc.t();
+			if (gstate.isTextureMapEnabled() && !clearMode) {
+				if (gstate.isModeThrough()) {
+					s *= 1.0f / (float)gstate.getTextureWidth(0);
+					t *= 1.0f / (float)gstate.getTextureHeight(0);
+				}
 
-		if (gstate.isTextureMapEnabled() && !clearMode) {
-			if (gstate.isModeThrough()) {
-				s *= 1.0f / (float)gstate.getTextureWidth(0);
-				t *= 1.0f / (float)gstate.getTextureHeight(0);
+				// TODO: ds/dt.
+				ApplyTexturing(prim_color, s, t, 0, 0, magFilt, texptr, texbufwidthbytes);
+			}
+
+			if (!clearMode)
+				prim_color += Vec4<int>(sec_color, 0);
+
+			ScreenCoords pprime = ScreenCoords(x, y, z);
+
+			DrawingCoords p = TransformUnit::ScreenToDrawing(pprime);
+			if (clearMode) {
+				DrawSinglePixel<true>(p, z, fog, prim_color);
+			} else {
+				DrawSinglePixel<false>(p, z, fog, prim_color);
 			}
-			// TODO: ds/dt.
-			ApplyTexturing(prim_color, s, t, 0, 0, magFilt, texptr, texbufwidthbytes);
 		}
 
-		if (!clearMode)
-			prim_color += Vec4<int>(sec_color, 0);
-
-		ScreenCoords pprime = ScreenCoords(x, y, z);
-
-		DrawingCoords p = TransformUnit::ScreenToDrawing(pprime);
-		if (clearMode) {
-			DrawSinglePixel<true>(p, z, fog, prim_color);
-		} else {
-			DrawSinglePixel<false>(p, z, fog, prim_color);
-		}
-
-		x = x + xinc;
-		y = y + yinc;
-		z = z + zinc;
+		x += xinc;
+		y += yinc;
+		z += zinc;
 	}
 }
 
diff --git a/pspautotests b/pspautotests
index 905c3018d0..e18cface3d 160000
--- a/pspautotests
+++ b/pspautotests
@@ -1 +1 @@
-Subproject commit 905c3018d01af9dfb511c87e65e07a49257a33ac
+Subproject commit e18cface3db64ccb96738dc128fe769b28fff65c