fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 15:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

drirc: Add string support

Browse source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Axel Davy <axel.davy@ens.fr>
This commit is contained in:
Axel Davy 2014-03-06 12:02:44 +01:00 • committed by Dave Airlie
parent 29800e6a3e
commit da3a47d682
2 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/mesa/drivers/dri/common/xmlconfig.c
View file

@ -309,6 +309,11 @@ static bool parseValue (driOptionValue *v, driOptionType type,
case DRI_FLOAT:
v->_float = strToF (string, &tail);
break;
case DRI_STRING:
if (v->_string)
free (v->_string);
v->_string = strndup(string, STRING_CONF_MAXLEN);
return GL_TRUE;
}
if (tail == string)
@ -402,6 +407,8 @@ static bool checkValue (const driOptionValue *v, const driOptionInfo *info) {
v->_float <= info->ranges[i].end._float)
return true;
break;
case DRI_STRING:
break;
default:
assert (0); /* should never happen */
}
@ -565,6 +572,8 @@ static void parseOptInfoAttr (struct OptInfoData *data, const XML_Char **attr) {
cache->info[opt].type = DRI_INT;
else if (!strcmp (attrVal[OA_TYPE], "float"))
cache->info[opt].type = DRI_FLOAT;
else if (!strcmp (attrVal[OA_TYPE], "string"))
cache->info[opt].type = DRI_STRING;
else
XML_FATAL ("illegal type in option: %s.", attrVal[OA_TYPE]);
@ -865,6 +874,7 @@ static void optConfEndElem (void *userData, const XML_Char *name) {
/** \brief Initialize an option cache based on info */
static void initOptionCache (driOptionCache *cache, const driOptionCache *info) {
GLuint i, size = 1 << info->tableSize;
cache->info = info->info;
cache->tableSize = info->tableSize;
cache->values = malloc((1<<info->tableSize) * sizeof (driOptionValue));
@ -874,6 +884,10 @@ static void initOptionCache (driOptionCache *cache, const driOptionCache *info)
}
memcpy (cache->values, info->values,
(1<<info->tableSize) * sizeof (driOptionValue));
for (i = 0; i < size; ++i) {
if (cache->info[i].type == DRI_STRING)
XSTRDUP(cache->values[i]._string, info->values[i]._string);
}
}
/** \brief Parse the named configuration file */
@ -979,6 +993,13 @@ void driDestroyOptionInfo (driOptionCache *info) {
}
void driDestroyOptionCache (driOptionCache *cache) {
if (cache->info) {
GLuint i, size = 1 << cache->tableSize;
for (i = 0; i < size; ++i) {
if (cache->info[i].type == DRI_STRING)
free(cache->values[i]._string);
}
}
free(cache->values);
}
@ -1011,3 +1032,11 @@ float driQueryOptionf (const driOptionCache *cache, const char *name) {
assert (cache->info[i].type == DRI_FLOAT);
return cache->values[i]._float;
}
char *driQueryOptionstr (const driOptionCache *cache, const char *name) {
GLuint i = findOption (cache, name);
/* make sure the option is defined and has the correct type */
assert (cache->info[i].name != NULL);
assert (cache->info[i].type == DRI_STRING);
return cache->values[i]._string;
}

7
src/mesa/drivers/dri/common/xmlconfig.h
View file

@ -32,9 +32,11 @@
#include <stdbool.h>
#define STRING_CONF_MAXLEN 25
/** \brief Option data types */
typedef enum driOptionType {
DRI_BOOL, DRI_ENUM, DRI_INT, DRI_FLOAT
DRI_BOOL, DRI_ENUM, DRI_INT, DRI_FLOAT, DRI_STRING
} driOptionType;
/** \brief Option value */
@ -42,6 +44,7 @@ typedef union driOptionValue {
bool _bool; /**< \brief Boolean */
int _int; /**< \brief Integer or Enum */
float _float; /**< \brief Floating-point */
char *_string; /**< \brief String */
} driOptionValue;
/** \brief Single range of valid values
@ -120,5 +123,7 @@ bool driQueryOptionb (const driOptionCache *cache, const char *name);
int driQueryOptioni (const driOptionCache *cache, const char *name);
/** \brief Query a floating-point option value */
float driQueryOptionf (const driOptionCache *cache, const char *name);
/** \brief Query a string option value */
char *driQueryOptionstr (const driOptionCache *cache, const char *name);
#endif