i965/urb: fixes division by zero
authorArdinartsev Nikita <ardinar23@gmail.com>
Mon, 16 May 2016 23:27:22 +0000 (02:27 +0300)
committerMatt Turner <mattst88@gmail.com>
Wed, 18 May 2016 18:09:37 +0000 (11:09 -0700)
Fixes regression introduced by af5ca43f2676bff7499f93277f908b681cb821d0

Reviewed-by: Matt Turner <mattst88@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95419

src/mesa/drivers/dri/i965/gen7_urb.c

index a412a4263b33f50dd6aeac95bc50c1ac98b48547..6d9aa028e95ed54bf43dcd2f4ed9960b2d01d86e 100644 (file)
@@ -292,25 +292,11 @@ gen7_upload_urb(struct brw_context *brw)
    if (remaining_space > total_wants)
       remaining_space = total_wants;
    if (remaining_space > 0) {
-      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;
+      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);
    }
 
    /* Sanity check that we haven't over-allocated. */