diff options
| author | Mark Janes <[email protected]> | 2019-07-02 14:11:04 -0700 |
|---|---|---|
| committer | Mark Janes <[email protected]> | 2019-08-07 21:33:55 -0700 |
| commit | 07d3bd5c46f98df977e9f305d527e3b3a18ea850 (patch) | |
| tree | f6f510b000247808990207da3c54ddbd0c79ca00 /src/mesa | |
| parent | 9ff8da0e5044c0a831c7022c98e193dbbaf8a74c (diff) | |
intel/perf: rename gen_perf to gen_perf_config
This structure contains the configurations of the metrics for the
current platform, and the settings needed for the perf subsystem to
query that configuration from the device. This data is available
without a rendering context, and needed to support MDAPI metrics for
Vulkan.
A gen_perf_context struct will be added later, which holds additional
state from the rendering context necessary for metric data
collection. The gen_perf struct needs a more precise name to reduce
confusion.
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_performance_query.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_performance_query_mdapi.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 25ae25e06ff..fa266e7b694 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -1162,7 +1162,7 @@ struct brw_context } predicate; struct { - struct gen_perf *perf; + struct gen_perf_config *perf; /* The i915 perf stream we open to setup + enable the OA counters */ int oa_stream_fd; diff --git a/src/mesa/drivers/dri/i965/brw_performance_query.c b/src/mesa/drivers/dri/i965/brw_performance_query.c index ea84d4ab327..eb2830a21f9 100644 --- a/src/mesa/drivers/dri/i965/brw_performance_query.c +++ b/src/mesa/drivers/dri/i965/brw_performance_query.c @@ -1383,7 +1383,7 @@ get_oa_counter_data(struct brw_context *brw, size_t data_size, uint8_t *data) { - struct gen_perf *perf = brw->perfquery.perf; + struct gen_perf_config *perf = brw->perfquery.perf; const struct gen_perf_query_info *query = obj->query; int n_counters = query->n_counters; int written = 0; @@ -1599,7 +1599,7 @@ static void init_pipeline_statistic_query_registers(struct brw_context *brw) { const struct gen_device_info *devinfo = &brw->screen->devinfo; - struct gen_perf *perf = brw->perfquery.perf; + struct gen_perf_config *perf = brw->perfquery.perf; struct gen_perf_query_info *query = gen_perf_query_append_query_info(perf, MAX_STAT_COUNTERS); diff --git a/src/mesa/drivers/dri/i965/brw_performance_query_mdapi.c b/src/mesa/drivers/dri/i965/brw_performance_query_mdapi.c index 379515d328f..a324209d613 100644 --- a/src/mesa/drivers/dri/i965/brw_performance_query_mdapi.c +++ b/src/mesa/drivers/dri/i965/brw_performance_query_mdapi.c @@ -67,7 +67,7 @@ void brw_perf_query_register_mdapi_oa_query(struct brw_context *brw) { const struct gen_device_info *devinfo = &brw->screen->devinfo; - struct gen_perf *perf = brw->perfquery.perf; + struct gen_perf_config *perf = brw->perfquery.perf; struct gen_perf_query_info *query = NULL; /* MDAPI requires different structures for pretty much every generation |