diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2019-09-14 00:02:45 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2019-09-14 00:03:10 +0300 |
| commit | fd5c1972cd5c8a826c0d40effb0e2d367389666a (patch) | |
| tree | 6a093944267ff888e9fb4323bac22d52468ab7ec /source/blender/blenlib/BLI_memblock.h | |
| parent | c80564ef9f557fadd235b87533b24d126e2138c9 (diff) | |
Revert "DRW: Refactor to support draw call batching"
This reverts commit ce34a6b0d727bbde6ae373afa8ec6c42bc8980ce.
Diffstat (limited to 'source/blender/blenlib/BLI_memblock.h')
| -rw-r--r-- | source/blender/blenlib/BLI_memblock.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/source/blender/blenlib/BLI_memblock.h b/source/blender/blenlib/BLI_memblock.h index 8bd8642a4e8..c5ef26ffb91 100644 --- a/source/blender/blenlib/BLI_memblock.h +++ b/source/blender/blenlib/BLI_memblock.h @@ -30,20 +30,16 @@ extern "C" { #include "BLI_compiler_attrs.h" -#define BLI_MEM_BLOCK_CHUNK_SIZE (1 << 15) /* 32KiB */ - struct BLI_memblock; typedef struct BLI_memblock BLI_memblock; typedef void (*MemblockValFreeFP)(void *val); -BLI_memblock *BLI_memblock_create_ex(uint elem_size, uint chunk_size) ATTR_WARN_UNUSED_RESULT; -void *BLI_memblock_alloc(BLI_memblock *mblk) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); +BLI_memblock *BLI_memblock_create(uint elem_size) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; +void *BLI_memblock_alloc(BLI_memblock *mblk) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); void BLI_memblock_clear(BLI_memblock *mblk, MemblockValFreeFP valfreefp) ATTR_NONNULL(1); void BLI_memblock_destroy(BLI_memblock *mblk, MemblockValFreeFP free_callback) ATTR_NONNULL(1); -#define BLI_memblock_create(elem_size) BLI_memblock_create_ex(elem_size, BLI_MEM_BLOCK_CHUNK_SIZE) - typedef struct BLI_memblock_iter { void **chunk_list; int cur_index; @@ -57,9 +53,6 @@ typedef struct BLI_memblock_iter { void BLI_memblock_iternew(BLI_memblock *pool, BLI_memblock_iter *iter) ATTR_NONNULL(); void *BLI_memblock_iterstep(BLI_memblock_iter *iter) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); -void *BLI_memblock_elem_get(BLI_memblock *mblk, int chunk, int elem) ATTR_WARN_UNUSED_RESULT - ATTR_NONNULL(); - #ifdef __cplusplus } #endif |