diff options
| author | Timothy Arceri <[email protected]> | 2016-10-03 10:39:29 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-10-03 15:29:58 +1100 |
| commit | eaf147cb463a2809366964ac4924e9aef719ffe7 (patch) | |
| tree | abad87319749db50a41eeb4a9074e1be3231a6ab /src/mesa/drivers | |
| parent | b67633ce5e3ca29526f8378168ec312aa80c2861 (diff) | |
i965: rename max_ds_* variable to max_tes_*
Using consistent naming allows us to create macros more easily.
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_tes.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_ds_state.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_urb.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen8_ds_state.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_tes.c b/src/mesa/drivers/dri/i965/brw_tes.c index ffd5702af54..ad0eb2e070f 100644 --- a/src/mesa/drivers/dri/i965/brw_tes.c +++ b/src/mesa/drivers/dri/i965/brw_tes.c @@ -217,7 +217,7 @@ brw_codegen_tes_prog(struct brw_context *brw, /* Scratch space is used for register spilling */ brw_alloc_stage_scratch(brw, stage_state, prog_data.base.base.total_scratch, - devinfo->max_ds_threads); + devinfo->max_tes_threads); brw_upload_cache(&brw->cache, BRW_CACHE_TES_PROG, key, sizeof(*key), diff --git a/src/mesa/drivers/dri/i965/gen7_ds_state.c b/src/mesa/drivers/dri/i965/gen7_ds_state.c index 57b187c5339..a255c53df9b 100644 --- a/src/mesa/drivers/dri/i965/gen7_ds_state.c +++ b/src/mesa/drivers/dri/i965/gen7_ds_state.c @@ -71,7 +71,7 @@ gen7_upload_ds_state(struct brw_context *brw) const struct brw_vue_prog_data *vue_prog_data = &tes_prog_data->base; const struct brw_stage_prog_data *prog_data = &vue_prog_data->base; - const unsigned thread_count = (devinfo->max_ds_threads - 1) << + const unsigned thread_count = (devinfo->max_tes_threads - 1) << (brw->is_haswell ? HSW_DS_MAX_THREADS_SHIFT : GEN7_DS_MAX_THREADS_SHIFT); if (active) { diff --git a/src/mesa/drivers/dri/i965/gen7_urb.c b/src/mesa/drivers/dri/i965/gen7_urb.c index fb87a94caa3..d38fc268229 100644 --- a/src/mesa/drivers/dri/i965/gen7_urb.c +++ b/src/mesa/drivers/dri/i965/gen7_urb.c @@ -320,7 +320,7 @@ gen7_upload_urb(struct brw_context *brw, unsigned vs_size, DIV_ROUND_UP(devinfo->urb.min_ds_entries * ds_entry_size_bytes, chunk_size_bytes); ds_wants = - DIV_ROUND_UP(devinfo->urb.max_ds_entries * ds_entry_size_bytes, + DIV_ROUND_UP(devinfo->urb.max_tes_entries * ds_entry_size_bytes, chunk_size_bytes) - ds_chunks; } @@ -379,7 +379,7 @@ gen7_upload_urb(struct brw_context *brw, unsigned vs_size, */ nr_vs_entries = MIN2(nr_vs_entries, devinfo->urb.max_vs_entries); nr_hs_entries = MIN2(nr_hs_entries, devinfo->urb.max_tcs_entries); - nr_ds_entries = MIN2(nr_ds_entries, devinfo->urb.max_ds_entries); + nr_ds_entries = MIN2(nr_ds_entries, devinfo->urb.max_tes_entries); nr_gs_entries = MIN2(nr_gs_entries, devinfo->urb.max_gs_entries); /* Ensure that we program a multiple of the granularity. */ diff --git a/src/mesa/drivers/dri/i965/gen8_ds_state.c b/src/mesa/drivers/dri/i965/gen8_ds_state.c index f7dbcec0480..c316d01dbb9 100644 --- a/src/mesa/drivers/dri/i965/gen8_ds_state.c +++ b/src/mesa/drivers/dri/i965/gen8_ds_state.c @@ -65,7 +65,7 @@ gen8_upload_ds_state(struct brw_context *brw) OUT_BATCH(GEN7_DS_ENABLE | GEN7_DS_STATISTICS_ENABLE | - (devinfo->max_ds_threads - 1) << HSW_DS_MAX_THREADS_SHIFT | + (devinfo->max_tes_threads - 1) << HSW_DS_MAX_THREADS_SHIFT | (vue_prog_data->dispatch_mode == DISPATCH_MODE_SIMD8 ? GEN7_DS_SIMD8_DISPATCH_ENABLE : 0) | (tes_prog_data->domain == BRW_TESS_DOMAIN_TRI ? |