Merge upstream d2458a471094dce70cfa0dc587d762d79c337705

BUG=505316
R=kbr@chromium.org

Review URL: https://codereview.chromium.org/1275513003.
diff --git a/src/mesa/swrast/s_aatriangle.c b/src/mesa/swrast/s_aatriangle.c
index b59177f..dbe02ba 100644
--- a/src/mesa/swrast/s_aatriangle.c
+++ b/src/mesa/swrast/s_aatriangle.c
@@ -112,20 +112,6 @@
 
 
 /*
- * Return 1 / solve_plane().
- */
-static inline GLfloat
-solve_plane_recip(GLfloat x, GLfloat y, const GLfloat plane[4])
-{
-   const GLfloat denom = plane[3] + plane[0] * x + plane[1] * y;
-   if (denom == 0.0F)
-      return 0.0F;
-   else
-      return -plane[2] / denom;
-}
-
-
-/*
  * Solve plane and return clamped GLchan value.
  */
 static inline GLchan