From 58db3395990e6408810b2c3ebdc6d6a32c758aab Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Fri, 11 Apr 2014 21:11:38 -0700 Subject: [PATCH] dri: Expand driParseDebugString return value to uint64_t. Users will downcast if they don't have >32 debug flags. Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/common/utils.c | 7 +++---- src/mesa/drivers/dri/common/utils.h | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c index 1f29e0b080c..eee77ec690c 100644 --- a/src/mesa/drivers/dri/common/utils.c +++ b/src/mesa/drivers/dri/common/utils.c @@ -32,6 +32,7 @@ #include #include #include +#include #include "main/macros.h" #include "main/mtypes.h" #include "main/cpuinfo.h" @@ -40,14 +41,12 @@ #include "dri_util.h" -unsigned +uint64_t driParseDebugString( const char * debug, const struct dri_debug_control * control ) { - unsigned flag; - + uint64_t flag = 0; - flag = 0; if ( debug != NULL ) { while( control->string != NULL ) { if ( !strcmp( debug, "all" ) || diff --git a/src/mesa/drivers/dri/common/utils.h b/src/mesa/drivers/dri/common/utils.h index 0941434469f..3760c38fcaf 100644 --- a/src/mesa/drivers/dri/common/utils.h +++ b/src/mesa/drivers/dri/common/utils.h @@ -34,10 +34,10 @@ struct dri_debug_control { const char * string; - unsigned flag; + uint64_t flag; }; -extern unsigned driParseDebugString( const char * debug, +extern uint64_t driParseDebugString( const char * debug, const struct dri_debug_control * control ); extern unsigned driGetRendererString( char * buffer, -- 2.30.2