From 00d3b13837c5edd299dc40cbd84505c8d1d5927f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marcin=20=C5=9Alusarz?= Date: Mon, 15 Jun 2020 14:26:26 +0200 Subject: [PATCH] iris: return max counter value for AMD_performance_monitor MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit glGetPerfMonitorCounterInfoAMD(..., ..., GL_COUNTER_RANGE_AMD, ...) returned NAN (binary representation of uint64_t(-1) as float) as a max value. Fixes: 0fd4359733e6 ("iris/perf: implement routines to return counter info") Signed-off-by: Marcin Ślusarz Reviewed-by: Lionel Landwerlin Part-of: --- src/gallium/drivers/iris/iris_monitor.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/iris/iris_monitor.c b/src/gallium/drivers/iris/iris_monitor.c index c4194052def..a8409607c7a 100644 --- a/src/gallium/drivers/iris/iris_monitor.c +++ b/src/gallium/drivers/iris/iris_monitor.c @@ -72,16 +72,17 @@ iris_get_monitor_info(struct pipe_screen *pscreen, unsigned index, case GEN_PERF_COUNTER_DATA_TYPE_BOOL32: case GEN_PERF_COUNTER_DATA_TYPE_UINT32: info->type = PIPE_DRIVER_QUERY_TYPE_UINT; - info->max_value.u32 = 0; + assert(counter->raw_max <= UINT32_MAX); + info->max_value.u32 = (uint32_t)counter->raw_max; break; case GEN_PERF_COUNTER_DATA_TYPE_UINT64: info->type = PIPE_DRIVER_QUERY_TYPE_UINT64; - info->max_value.u64 = 0; + info->max_value.u64 = counter->raw_max; break; case GEN_PERF_COUNTER_DATA_TYPE_FLOAT: case GEN_PERF_COUNTER_DATA_TYPE_DOUBLE: info->type = PIPE_DRIVER_QUERY_TYPE_FLOAT; - info->max_value.u64 = -1; + info->max_value.f = counter->raw_max; break; default: assert(false); -- 2.30.2