diff options
| author | Timothy Arceri <[email protected]> | 2016-10-03 10:39:28 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-10-03 15:29:51 +1100 |
| commit | b67633ce5e3ca29526f8378168ec312aa80c2861 (patch) | |
| tree | adeb24991db3a9803099663504f9a2090da35ffb /src/mesa | |
| parent | da274ba5f88ca76bb2e4369967cea381b9f219e4 (diff) | |
i965: rename max_hs_* variables to max_tcs_*
Using consistent naming allows us to create macros more easily.
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_tcs.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_hs_state.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_urb.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen8_hs_state.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_tcs.c b/src/mesa/drivers/dri/i965/brw_tcs.c index d62ad662b49..1f1b1a575d2 100644 --- a/src/mesa/drivers/dri/i965/brw_tcs.c +++ b/src/mesa/drivers/dri/i965/brw_tcs.c @@ -298,7 +298,7 @@ brw_codegen_tcs_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_hs_threads); + devinfo->max_tcs_threads); brw_upload_cache(&brw->cache, BRW_CACHE_TCS_PROG, key, sizeof(*key), diff --git a/src/mesa/drivers/dri/i965/gen7_hs_state.c b/src/mesa/drivers/dri/i965/gen7_hs_state.c index 759655b1966..932bfb14169 100644 --- a/src/mesa/drivers/dri/i965/gen7_hs_state.c +++ b/src/mesa/drivers/dri/i965/gen7_hs_state.c @@ -78,7 +78,7 @@ gen7_upload_hs_state(struct brw_context *brw) GEN7_HS_SAMPLER_COUNT) | SET_FIELD(prog_data->base.binding_table.size_bytes / 4, GEN7_HS_BINDING_TABLE_ENTRY_COUNT) | - (devinfo->max_hs_threads - 1)); + (devinfo->max_tcs_threads - 1)); OUT_BATCH(GEN7_HS_ENABLE | GEN7_HS_STATISTICS_ENABLE | SET_FIELD(brw->tcs.prog_data->instances - 1, diff --git a/src/mesa/drivers/dri/i965/gen7_urb.c b/src/mesa/drivers/dri/i965/gen7_urb.c index 7eb587ca671..fb87a94caa3 100644 --- a/src/mesa/drivers/dri/i965/gen7_urb.c +++ b/src/mesa/drivers/dri/i965/gen7_urb.c @@ -313,7 +313,7 @@ gen7_upload_urb(struct brw_context *brw, unsigned vs_size, DIV_ROUND_UP(hs_granularity * hs_entry_size_bytes, chunk_size_bytes); hs_wants = - DIV_ROUND_UP(devinfo->urb.max_hs_entries * hs_entry_size_bytes, + DIV_ROUND_UP(devinfo->urb.max_tcs_entries * hs_entry_size_bytes, chunk_size_bytes) - hs_chunks; ds_chunks = @@ -378,7 +378,7 @@ gen7_upload_urb(struct brw_context *brw, unsigned vs_size, * than the maximum allowed amount, so correct for that. */ nr_vs_entries = MIN2(nr_vs_entries, devinfo->urb.max_vs_entries); - nr_hs_entries = MIN2(nr_hs_entries, devinfo->urb.max_hs_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_gs_entries = MIN2(nr_gs_entries, devinfo->urb.max_gs_entries); diff --git a/src/mesa/drivers/dri/i965/gen8_hs_state.c b/src/mesa/drivers/dri/i965/gen8_hs_state.c index 7b9f6341e6c..14af89aaf32 100644 --- a/src/mesa/drivers/dri/i965/gen8_hs_state.c +++ b/src/mesa/drivers/dri/i965/gen8_hs_state.c @@ -45,7 +45,7 @@ gen8_upload_hs_state(struct brw_context *brw) GEN7_HS_BINDING_TABLE_ENTRY_COUNT)); OUT_BATCH(GEN7_HS_ENABLE | GEN7_HS_STATISTICS_ENABLE | - (devinfo->max_hs_threads - 1) << GEN8_HS_MAX_THREADS_SHIFT | + (devinfo->max_tcs_threads - 1) << GEN8_HS_MAX_THREADS_SHIFT | SET_FIELD(brw->tcs.prog_data->instances - 1, GEN7_HS_INSTANCE_COUNT)); OUT_BATCH(stage_state->prog_offset); |