From 8392179fcc10024e3d80d6adedb38c30fd3cacc7 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 2 Jul 2014 08:24:05 +1000 Subject: [PATCH] xmlconfig/dri: bool -> unsigned char Drop stdbool, due to the X server being a pain and having struct members called bool, although I've sent a patch to fix that we should retain stupidity here. Use unsigned char which is what GLboolean is anyways. Signed-off-by: Dave Airlie --- include/GL/internal/dri_interface.h | 3 +-- src/mesa/drivers/dri/common/dri_util.c | 2 +- src/mesa/drivers/dri/common/xmlconfig.c | 8 ++++---- src/mesa/drivers/dri/common/xmlconfig.h | 8 +++----- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h index 725d622..7c28c13 100644 --- a/include/GL/internal/dri_interface.h +++ b/include/GL/internal/dri_interface.h @@ -40,7 +40,6 @@ #ifndef DRI_INTERFACE_H #define DRI_INTERFACE_H -#include /* For archs with no drm.h */ #if defined(__APPLE__) || defined(__CYGWIN__) || defined(__GNU__) #ifndef __NOT_HAVE_DRM_H @@ -1295,7 +1294,7 @@ typedef struct __DRI2configQueryExtensionRec __DRI2configQueryExtension; struct __DRI2configQueryExtensionRec { __DRIextension base; - int (*configQueryb)(__DRIscreen *screen, const char *var, bool *val); + int (*configQueryb)(__DRIscreen *screen, const char *var, unsigned char *val); int (*configQueryi)(__DRIscreen *screen, const char *var, int *val); int (*configQueryf)(__DRIscreen *screen, const char *var, float *val); }; diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index 8506f53..6c78928 100644 --- a/src/mesa/drivers/dri/common/dri_util.c +++ b/src/mesa/drivers/dri/common/dri_util.c @@ -677,7 +677,7 @@ dri2ReleaseBuffer(__DRIscreen *screen, __DRIbuffer *buffer) static int -dri2ConfigQueryb(__DRIscreen *screen, const char *var, bool *val) +dri2ConfigQueryb(__DRIscreen *screen, const char *var, unsigned char *val) { if (!driCheckOption(&screen->optionCache, var, DRI_BOOL)) return -1; diff --git a/src/mesa/drivers/dri/common/xmlconfig.c b/src/mesa/drivers/dri/common/xmlconfig.c index 5091c11..58d0e06 100644 --- a/src/mesa/drivers/dri/common/xmlconfig.c +++ b/src/mesa/drivers/dri/common/xmlconfig.c @@ -285,7 +285,7 @@ static float strToF (const XML_Char *string, const XML_Char **tail) { } /** \brief Parse a value of a given type. */ -static bool parseValue (driOptionValue *v, driOptionType type, +static unsigned char parseValue (driOptionValue *v, driOptionType type, const XML_Char *string) { const XML_Char *tail = NULL; /* skip leading white-space */ @@ -328,7 +328,7 @@ static bool parseValue (driOptionValue *v, driOptionType type, } /** \brief Parse a list of ranges of type info->type. */ -static bool parseRanges (driOptionInfo *info, const XML_Char *string) { +static unsigned char parseRanges (driOptionInfo *info, const XML_Char *string) { XML_Char *cp, *range; uint32_t nRanges, i; driOptionRange *ranges; @@ -1003,13 +1003,13 @@ void driDestroyOptionCache (driOptionCache *cache) { free(cache->values); } -bool driCheckOption (const driOptionCache *cache, const char *name, +unsigned char driCheckOption (const driOptionCache *cache, const char *name, driOptionType type) { uint32_t i = findOption (cache, name); return cache->info[i].name != NULL && cache->info[i].type == type; } -bool driQueryOptionb (const driOptionCache *cache, const char *name) { +unsigned char driQueryOptionb (const driOptionCache *cache, const char *name) { uint32_t i = findOption (cache, name); /* make sure the option is defined and has the correct type */ assert (cache->info[i].name != NULL); diff --git a/src/mesa/drivers/dri/common/xmlconfig.h b/src/mesa/drivers/dri/common/xmlconfig.h index 386ddf1..af03234 100644 --- a/src/mesa/drivers/dri/common/xmlconfig.h +++ b/src/mesa/drivers/dri/common/xmlconfig.h @@ -30,8 +30,6 @@ #ifndef __XMLCONFIG_H #define __XMLCONFIG_H -#include - #define STRING_CONF_MAXLEN 25 /** \brief Option data types */ @@ -41,7 +39,7 @@ typedef enum driOptionType { /** \brief Option value */ typedef union driOptionValue { - bool _bool; /**< \brief Boolean */ + unsigned char _bool; /**< \brief Boolean */ int _int; /**< \brief Integer or Enum */ float _float; /**< \brief Floating-point */ char *_string; /**< \brief String */ @@ -114,11 +112,11 @@ void driDestroyOptionInfo (driOptionCache *info); void driDestroyOptionCache (driOptionCache *cache); /** \brief Check if there exists a certain option */ -bool driCheckOption (const driOptionCache *cache, const char *name, +unsigned char driCheckOption (const driOptionCache *cache, const char *name, driOptionType type); /** \brief Query a boolean option value */ -bool driQueryOptionb (const driOptionCache *cache, const char *name); +unsigned char driQueryOptionb (const driOptionCache *cache, const char *name); /** \brief Query an integer option value */ int driQueryOptioni (const driOptionCache *cache, const char *name); /** \brief Query a floating-point option value */ -- 2.7.4