Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> --- src/mesa/drivers/dri/i965/brw_performance_query.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_performance_query.c b/src/mesa/drivers/dri/i965/brw_performance_query.c index f7124ce621f..fed0bfd8b9b 100644 --- a/src/mesa/drivers/dri/i965/brw_performance_query.c +++ b/src/mesa/drivers/dri/i965/brw_performance_query.c @@ -825,6 +825,7 @@ static void accumulate_oa_reports(struct brw_context *brw, struct brw_perf_query_object *obj) { + const struct gen_device_info *devinfo = &brw->screen->devinfo; struct gl_perf_query_object *o = &obj->base; uint32_t *start; uint32_t *last; @@ -903,8 +904,7 @@ accumulate_oa_reports(struct brw_context *brw, * For Haswell we can rely on the HW to stop the progress * of OA counters while any other context is acctive. */ - if (brw->gen >= 8) { - + if (devinfo->gen >= 8) { if (in_ctx && report[2] != ctx_id) { DBG("i915 perf: Switch AWAY (observed by ID change)\n"); in_ctx = false; @@ -1616,6 +1616,7 @@ add_basic_stat_reg(struct brw_perf_query_info *query, static void init_pipeline_statistic_query_registers(struct brw_context *brw) { + const struct gen_device_info *devinfo = &brw->screen->devinfo; struct brw_perf_query_info *query = append_query_info(brw); query->kind = PIPELINE_STATS; @@ -1631,7 +1632,7 @@ init_pipeline_statistic_query_registers(struct brw_context *brw) add_basic_stat_reg(query, VS_INVOCATION_COUNT, "N vertex shader invocations"); - if (brw->gen == 6) { + if (devinfo->gen == 6) { add_stat_reg(query, GEN6_SO_PRIM_STORAGE_NEEDED, 1, 1, "SO_PRIM_STORAGE_NEEDED", "N geometry shader stream-out primitives (total)"); @@ -1680,7 +1681,7 @@ init_pipeline_statistic_query_registers(struct brw_context *brw) add_basic_stat_reg(query, CL_PRIMITIVES_COUNT, "N primitives leaving clipping"); - if (brw->is_haswell || brw->gen == 8) + if (devinfo->is_haswell || devinfo->gen == 8) add_stat_reg(query, PS_INVOCATION_COUNT, 1, 4, "N fragment shader invocations", "N fragment shader invocations"); @@ -1690,7 +1691,7 @@ init_pipeline_statistic_query_registers(struct brw_context *brw) add_basic_stat_reg(query, PS_DEPTH_COUNT, "N z-pass fragments"); - if (brw->gen >= 7) + if (devinfo->gen >= 7) add_basic_stat_reg(query, CS_INVOCATION_COUNT, "N compute shader invocations"); -- 2.11.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev