diff options
| author | Kenneth Graunke <[email protected]> | 2016-11-15 00:07:35 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2016-11-19 11:39:56 -0800 |
| commit | 639af2a7c637e39b2d30f9891f67da76af50cab7 (patch) | |
| tree | 45df5ac5ead5c0c94c02062dc984ea69df21b588 /src/mesa | |
| parent | 58c09e72b15768524e5b76b55eae506391b663d8 (diff) | |
intel: Convert devinfo->urb.min_*_entries into an array.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Topi Pohjolainen <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_urb.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_urb.c | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_urb.c b/src/mesa/drivers/dri/i965/gen6_urb.c index b91d7fa3ab3..e69a1dfada1 100644 --- a/src/mesa/drivers/dri/i965/gen6_urb.c +++ b/src/mesa/drivers/dri/i965/gen6_urb.c @@ -74,7 +74,8 @@ gen6_upload_urb(struct brw_context *brw, unsigned vs_size, brw->urb.nr_vs_entries = ROUND_DOWN_TO(nr_vs_entries, 4); brw->urb.nr_gs_entries = ROUND_DOWN_TO(nr_gs_entries, 4); - assert(brw->urb.nr_vs_entries >= devinfo->urb.min_vs_entries); + assert(brw->urb.nr_vs_entries >= + devinfo->urb.min_entries[MESA_SHADER_VERTEX]); assert(brw->urb.nr_vs_entries % 4 == 0); assert(brw->urb.nr_gs_entries % 4 == 0); assert(vs_size <= 5); diff --git a/src/mesa/drivers/dri/i965/gen7_urb.c b/src/mesa/drivers/dri/i965/gen7_urb.c index ca347b49d72..eb811b45659 100644 --- a/src/mesa/drivers/dri/i965/gen7_urb.c +++ b/src/mesa/drivers/dri/i965/gen7_urb.c @@ -284,7 +284,8 @@ gen7_upload_urb(struct brw_context *brw, unsigned vs_size, * greater than or equal to 192." */ unsigned vs_min_entries = - tess_present && brw->gen == 8 ? 192 : devinfo->urb.min_vs_entries; + tess_present && brw->gen == 8 ? + 192 : devinfo->urb.min_entries[MESA_SHADER_VERTEX]; /* Min VS Entries isn't a multiple of 8 on Cherryview/Broxton; round up */ vs_min_entries = ALIGN(vs_min_entries, vs_granularity); @@ -327,8 +328,8 @@ gen7_upload_urb(struct brw_context *brw, unsigned vs_size, hs_entry_size_bytes, chunk_size_bytes) - hs_chunks; ds_chunks = - DIV_ROUND_UP(devinfo->urb.min_ds_entries * ds_entry_size_bytes, - chunk_size_bytes); + DIV_ROUND_UP(devinfo->urb.min_entries[MESA_SHADER_TESS_EVAL] * + ds_entry_size_bytes, chunk_size_bytes); ds_wants = DIV_ROUND_UP(devinfo->urb.max_entries[MESA_SHADER_TESS_EVAL] * ds_entry_size_bytes, chunk_size_bytes) - ds_chunks; @@ -410,7 +411,7 @@ gen7_upload_urb(struct brw_context *brw, unsigned vs_size, assert(nr_gs_entries >= 2); if (tess_present) { assert(nr_hs_entries >= 1); - assert(nr_ds_entries >= devinfo->urb.min_ds_entries); + assert(nr_ds_entries >= devinfo->urb.min_entries[MESA_SHADER_TESS_EVAL]); } /* Gen7 doesn't actually use brw->urb.nr_{vs,gs}_entries, but it seems |