From: Thomas Helland Date: Thu, 1 Jun 2017 20:21:19 +0000 (+0200) Subject: util: Move u_dynarray to src/util X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f0372814a9b8676c0b26de30c4cc33ada64baa7b;p=mesa.git util: Move u_dynarray to src/util This will be used as the basis for unification Reviewed-by: Marek Olšák Reviewed-by: Eric Engestrom --- diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources index 0e450ab3d7e..99ab0c00bb5 100644 --- a/src/gallium/auxiliary/Makefile.sources +++ b/src/gallium/auxiliary/Makefile.sources @@ -221,7 +221,6 @@ C_SOURCES := \ util/u_dump_defines.c \ util/u_dump.h \ util/u_dump_state.c \ - util/u_dynarray.h \ util/u_fifo.h \ util/u_format.c \ util/u_format.h \ diff --git a/src/gallium/auxiliary/util/u_dynarray.h b/src/gallium/auxiliary/util/u_dynarray.h deleted file mode 100644 index 7b7a093d824..00000000000 --- a/src/gallium/auxiliary/util/u_dynarray.h +++ /dev/null @@ -1,114 +0,0 @@ -/************************************************************************** - * - * Copyright 2010 Luca Barbieri - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial - * portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE - * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - **************************************************************************/ - -#ifndef U_DYNARRAY_H -#define U_DYNARRAY_H - -#include "pipe/p_compiler.h" -#include "util/u_memory.h" - -/* A zero-initialized version of this is guaranteed to represent an - * empty array. - * - * Also, size <= capacity and data != 0 if and only if capacity != 0 - * capacity will always be the allocation size of data - */ -struct util_dynarray -{ - void *data; - unsigned size; - unsigned capacity; -}; - -static inline void -util_dynarray_init(struct util_dynarray *buf) -{ - memset(buf, 0, sizeof(*buf)); -} - -static inline void -util_dynarray_fini(struct util_dynarray *buf) -{ - if(buf->data) - { - FREE(buf->data); - util_dynarray_init(buf); - } -} - -/* use util_dynarray_trim to reduce the allocated storage */ -static inline void * -util_dynarray_resize(struct util_dynarray *buf, unsigned newsize) -{ - char *p; - if(newsize > buf->capacity) - { - unsigned newcap = buf->capacity << 1; - if(newsize > newcap) - newcap = newsize; - buf->data = REALLOC(buf->data, buf->capacity, newcap); - buf->capacity = newcap; - } - - p = (char *)buf->data + buf->size; - buf->size = newsize; - return p; -} - -static inline void * -util_dynarray_grow(struct util_dynarray *buf, int diff) -{ - return util_dynarray_resize(buf, buf->size + diff); -} - -static inline void -util_dynarray_trim(struct util_dynarray *buf) -{ - if (buf->size != buf->capacity) { - if (buf->size) { - buf->data = REALLOC(buf->data, buf->capacity, buf->size); - buf->capacity = buf->size; - } - else { - FREE(buf->data); - buf->data = 0; - buf->capacity = 0; - } - } -} - -#define util_dynarray_append(buf, type, v) do {type __v = (v); memcpy(util_dynarray_grow((buf), sizeof(type)), &__v, sizeof(type));} while(0) -#define util_dynarray_top_ptr(buf, type) (type*)((char*)(buf)->data + (buf)->size - sizeof(type)) -#define util_dynarray_top(buf, type) *util_dynarray_top_ptr(buf, type) -#define util_dynarray_pop_ptr(buf, type) (type*)((char*)(buf)->data + ((buf)->size -= sizeof(type))) -#define util_dynarray_pop(buf, type) *util_dynarray_pop_ptr(buf, type) -#define util_dynarray_contains(buf, type) ((buf)->size >= sizeof(type)) -#define util_dynarray_element(buf, type, idx) ((type*)(buf)->data + (idx)) -#define util_dynarray_begin(buf) ((buf)->data) -#define util_dynarray_end(buf) ((void*)util_dynarray_element((buf), char, (buf)->size)) - -#endif /* U_DYNARRAY_H */ - diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources index e9f820a3ee0..8ea5f29533b 100644 --- a/src/util/Makefile.sources +++ b/src/util/Makefile.sources @@ -45,6 +45,7 @@ MESA_UTIL_FILES := \ texcompress_rgtc_tmp.h \ u_atomic.c \ u_atomic.h \ + u_dynarray.h \ u_endian.h \ u_queue.c \ u_queue.h \ diff --git a/src/util/u_dynarray.h b/src/util/u_dynarray.h new file mode 100644 index 00000000000..7b7a093d824 --- /dev/null +++ b/src/util/u_dynarray.h @@ -0,0 +1,114 @@ +/************************************************************************** + * + * Copyright 2010 Luca Barbieri + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + **************************************************************************/ + +#ifndef U_DYNARRAY_H +#define U_DYNARRAY_H + +#include "pipe/p_compiler.h" +#include "util/u_memory.h" + +/* A zero-initialized version of this is guaranteed to represent an + * empty array. + * + * Also, size <= capacity and data != 0 if and only if capacity != 0 + * capacity will always be the allocation size of data + */ +struct util_dynarray +{ + void *data; + unsigned size; + unsigned capacity; +}; + +static inline void +util_dynarray_init(struct util_dynarray *buf) +{ + memset(buf, 0, sizeof(*buf)); +} + +static inline void +util_dynarray_fini(struct util_dynarray *buf) +{ + if(buf->data) + { + FREE(buf->data); + util_dynarray_init(buf); + } +} + +/* use util_dynarray_trim to reduce the allocated storage */ +static inline void * +util_dynarray_resize(struct util_dynarray *buf, unsigned newsize) +{ + char *p; + if(newsize > buf->capacity) + { + unsigned newcap = buf->capacity << 1; + if(newsize > newcap) + newcap = newsize; + buf->data = REALLOC(buf->data, buf->capacity, newcap); + buf->capacity = newcap; + } + + p = (char *)buf->data + buf->size; + buf->size = newsize; + return p; +} + +static inline void * +util_dynarray_grow(struct util_dynarray *buf, int diff) +{ + return util_dynarray_resize(buf, buf->size + diff); +} + +static inline void +util_dynarray_trim(struct util_dynarray *buf) +{ + if (buf->size != buf->capacity) { + if (buf->size) { + buf->data = REALLOC(buf->data, buf->capacity, buf->size); + buf->capacity = buf->size; + } + else { + FREE(buf->data); + buf->data = 0; + buf->capacity = 0; + } + } +} + +#define util_dynarray_append(buf, type, v) do {type __v = (v); memcpy(util_dynarray_grow((buf), sizeof(type)), &__v, sizeof(type));} while(0) +#define util_dynarray_top_ptr(buf, type) (type*)((char*)(buf)->data + (buf)->size - sizeof(type)) +#define util_dynarray_top(buf, type) *util_dynarray_top_ptr(buf, type) +#define util_dynarray_pop_ptr(buf, type) (type*)((char*)(buf)->data + ((buf)->size -= sizeof(type))) +#define util_dynarray_pop(buf, type) *util_dynarray_pop_ptr(buf, type) +#define util_dynarray_contains(buf, type) ((buf)->size >= sizeof(type)) +#define util_dynarray_element(buf, type, idx) ((type*)(buf)->data + (idx)) +#define util_dynarray_begin(buf) ((buf)->data) +#define util_dynarray_end(buf) ((void*)util_dynarray_element((buf), char, (buf)->size)) + +#endif /* U_DYNARRAY_H */ +