Mesa (master): dri: Expand driParseDebugString return value to uint64_t.

Matt Turner mattst88 at kemper.freedesktop.org
Tue Apr 15 17:30:09 UTC 2014


Module: Mesa
Branch: master
Commit: 58db3395990e6408810b2c3ebdc6d6a32c758aab
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=58db3395990e6408810b2c3ebdc6d6a32c758aab

Author: Matt Turner <mattst88 at gmail.com>
Date:   Fri Apr 11 21:11:38 2014 -0700

dri: Expand driParseDebugString return value to uint64_t.

Users will downcast if they don't have >32 debug flags.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 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 1f29e0b..eee77ec 100644
--- a/src/mesa/drivers/dri/common/utils.c
+++ b/src/mesa/drivers/dri/common/utils.c
@@ -32,6 +32,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdbool.h>
+#include <stdint.h>
 #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 0941434..3760c38 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,




More information about the mesa-commit mailing list