From: Matt Turner <mattst88@gmail.com>
Date: Wed, 18 May 2016 19:48:20 +0000 (-0700)
Subject: Revert "i965/urb: fixes division by zero"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9c290b1e5468a66bd856ceee372079e3ce43def8;p=mesa.git

Revert "i965/urb: fixes division by zero"

This reverts commit 2a8aa1e3deb99a1ae16d942318da648c1327ece5.
---

diff --git a/src/mesa/drivers/dri/i965/gen7_urb.c b/src/mesa/drivers/dri/i965/gen7_urb.c
index 6d9aa028e95..a412a4263b3 100644
--- a/src/mesa/drivers/dri/i965/gen7_urb.c
+++ b/src/mesa/drivers/dri/i965/gen7_urb.c
@@ -292,11 +292,25 @@ gen7_upload_urb(struct brw_context *brw)
    if (remaining_space > total_wants)
       remaining_space = total_wants;
    if (remaining_space > 0) {
-      float ratio = ((float) remaining_space) / total_wants;
-      vs_chunks += lroundf(vs_wants * ratio);
-      hs_chunks += lroundf(hs_wants * ratio);
-      ds_chunks += lroundf(ds_wants * ratio);
-      gs_chunks += lroundf(gs_wants * ratio);
+      unsigned vs_additional = (unsigned)
+         roundf(vs_wants * (((float) remaining_space) / total_wants));
+      vs_chunks += vs_additional;
+      remaining_space -= vs_additional;
+      total_wants -= vs_wants;
+
+      unsigned hs_additional = (unsigned)
+         round(hs_wants * (((double) remaining_space) / total_wants));
+      hs_chunks += hs_additional;
+      remaining_space -= hs_additional;
+      total_wants -= hs_wants;
+
+      unsigned ds_additional = (unsigned)
+         round(ds_wants * (((double) remaining_space) / total_wants));
+      ds_chunks += ds_additional;
+      remaining_space -= ds_additional;
+      total_wants -= ds_wants;
+
+      gs_chunks += remaining_space;
    }
 
    /* Sanity check that we haven't over-allocated. */