From: Paul Berry <stereotype441@gmail.com>
Date: Tue, 3 Sep 2013 21:19:18 +0000 (-0700)
Subject: i965/gen6: Fix assertions on VS/GS URB size.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=57b8cff33cab9ce93e3ee1252e12d66e48bb67e0;p=mesa.git

i965/gen6: Fix assertions on VS/GS URB size.

The "{VS,GS} URB Entry Allocation Size" fields of 3DSTATE_URB allow
values in the range 0-4, but they are U8-1 fields, so the range of
possible allocation sizes is 1-5.  We were erroneously prohibiting a
size of 5.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/drivers/dri/i965/gen6_urb.c b/src/mesa/drivers/dri/i965/gen6_urb.c
index bb4cfa80a49..b694f5d189c 100644
--- a/src/mesa/drivers/dri/i965/gen6_urb.c
+++ b/src/mesa/drivers/dri/i965/gen6_urb.c
@@ -86,8 +86,8 @@ gen6_upload_urb( struct brw_context *brw )
    assert(brw->urb.nr_vs_entries >= brw->urb.min_vs_entries);
    assert(brw->urb.nr_vs_entries % 4 == 0);
    assert(brw->urb.nr_gs_entries % 4 == 0);
-   assert(vs_size < 5);
-   assert(gs_size < 5);
+   assert(vs_size <= 5);
+   assert(gs_size <= 5);
 
    BEGIN_BATCH(3);
    OUT_BATCH(_3DSTATE_URB << 16 | (3 - 2));