diff options
| author | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2017-06-30 11:56:50 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2017-07-13 13:27:44 +0200 |
| commit | 8cb775282bcd2a13c9ee3373d3f930d70bfa1edf (patch) | |
| tree | 1b06c09bb461aa8ffb232a4568261f6553d1da8d | |
| parent | 203acc677e138c9b47cbefb4d80d3e8f55835c71 (diff) | |
xmlconfig: remove GL type dependencies
| -rw-r--r-- | src/mesa/drivers/dri/common/xmlconfig.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/common/xmlconfig.c b/src/mesa/drivers/dri/common/xmlconfig.c index d4649370ee..9bd587b0e1 100644 --- a/src/mesa/drivers/dri/common/xmlconfig.c +++ b/src/mesa/drivers/dri/common/xmlconfig.c @@ -36,8 +36,6 @@ #include <math.h> #include <unistd.h> #include <errno.h> -#include "main/imports.h" -#include "utils.h" #include "xmlconfig.h" #undef GET_PROGRAM_NAME @@ -332,7 +330,7 @@ parseValue(driOptionValue *v, driOptionType type, const XML_Char *string) case DRI_STRING: free (v->_string); v->_string = strndup(string, STRING_CONF_MAXLEN); - return GL_TRUE; + return true; } if (tail == string) @@ -922,7 +920,7 @@ optConfEndElem(void *userData, const XML_Char *name) static void initOptionCache(driOptionCache *cache, const driOptionCache *info) { - GLuint i, size = 1 << info->tableSize; + unsigned i, size = 1 << info->tableSize; cache->info = info->info; cache->tableSize = info->tableSize; cache->values = malloc((1<<info->tableSize) * sizeof (driOptionValue)); @@ -1054,7 +1052,7 @@ void driDestroyOptionCache(driOptionCache *cache) { if (cache->info) { - GLuint i, size = 1 << cache->tableSize; + unsigned i, size = 1 << cache->tableSize; for (i = 0; i < size; ++i) { if (cache->info[i].type == DRI_STRING) free(cache->values[i]._string); @@ -1104,7 +1102,7 @@ driQueryOptionf(const driOptionCache *cache, const char *name) char * driQueryOptionstr(const driOptionCache *cache, const char *name) { - GLuint i = findOption (cache, name); + uint32_t 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); |