diff options
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_ghash.h | 7 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_linklist_stack.h | 14 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_string.h | 1 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_string_utf8.h | 1 | ||||
-rw-r--r-- | source/blender/blenlib/intern/BLI_heap.c | 3 | ||||
-rw-r--r-- | source/blender/blenlib/intern/array_store.c | 12 | ||||
-rw-r--r-- | source/blender/blenlib/intern/boxpack_2d.c | 4 | ||||
-rw-r--r-- | source/blender/blenlib/intern/convexhull_2d.c | 3 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_color_inline.c | 1 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_geom.c | 1 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_matrix.c | 4 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_vector.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_vector_inline.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/rct.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/smallhash.c | 1 |
15 files changed, 46 insertions, 12 deletions
diff --git a/source/blender/blenlib/BLI_ghash.h b/source/blender/blenlib/BLI_ghash.h index e38848e2967..bc517f81955 100644 --- a/source/blender/blenlib/BLI_ghash.h +++ b/source/blender/blenlib/BLI_ghash.h @@ -74,6 +74,7 @@ enum { #endif }; +/* -------------------------------------------------------------------- */ /** \name GHash API * * Defined in ``BLI_ghash.c`` @@ -124,6 +125,7 @@ void BLI_ghash_flag_clear(GHash *gh, unsigned int flag); /** \} */ +/* -------------------------------------------------------------------- */ /** \name GHash Iterator * \{ */ @@ -175,6 +177,7 @@ BLI_INLINE bool BLI_ghashIterator_done(GHashIterator *ghi) /** \} */ +/* -------------------------------------------------------------------- */ /** \name GSet API * A 'set' implementation (unordered collection of unique elements). * @@ -222,6 +225,7 @@ void *BLI_gset_pop_key(GSet *gs, const void *key) ATTR_WARN_UNUSED_RESULT; /** \} */ +/* -------------------------------------------------------------------- */ /** \name GSet Iterator * \{ */ @@ -272,6 +276,7 @@ BLI_INLINE bool BLI_gsetIterator_done(GSetIterator *gsi) /** \} */ +/* -------------------------------------------------------------------- */ /** \name GHash/GSet Debugging API's * \{ */ @@ -297,6 +302,7 @@ double BLI_gset_calc_quality(GSet *gs); #endif /* GHASH_INTERNAL_API */ /** \} */ +/* -------------------------------------------------------------------- */ /** \name GHash/GSet Macros * \{ */ @@ -324,6 +330,7 @@ double BLI_gset_calc_quality(GSet *gs); /** \} */ +/* -------------------------------------------------------------------- */ /** \name GHash/GSet Utils * * Defined in ``BLI_ghash_utils.c`` diff --git a/source/blender/blenlib/BLI_linklist_stack.h b/source/blender/blenlib/BLI_linklist_stack.h index 065ed12f353..be98304e6b5 100644 --- a/source/blender/blenlib/BLI_linklist_stack.h +++ b/source/blender/blenlib/BLI_linklist_stack.h @@ -32,12 +32,9 @@ */ /* -------------------------------------------------------------------- */ -/* Linked Stack using BLI_mempool - * - * Uses mempool for storage. - */ - /** \name Linked Stack (mempool) + * + * Uses #BLI_mempool for storage. * \{ */ #define BLI_LINKSTACK_DECLARE(var, type) \ @@ -94,13 +91,12 @@ /** \} */ /* -------------------------------------------------------------------- */ -/* Linked Stack, using stack memory (alloca) +/** \name Linked Stack (alloca) + * + * Linked Stack, using stack memory (alloca). * * alloca never frees, pop'd items are stored in a free-list for reuse. * only use for lists small enough to fit on the stack. - */ - -/** \name Linked Stack (alloca) * \{ */ #ifdef __GNUC__ diff --git a/source/blender/blenlib/BLI_string.h b/source/blender/blenlib/BLI_string.h index 6434464a012..2d745e63764 100644 --- a/source/blender/blenlib/BLI_string.h +++ b/source/blender/blenlib/BLI_string.h @@ -147,6 +147,7 @@ int BLI_string_find_split_words(const char *str, int r_words[][2], int words_max) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); +/* -------------------------------------------------------------------- */ /** \name String Copy/Format Macros * Avoid repeating destination with `sizeof(..)`. * \note `ARRAY_SIZE` allows pointers on some platforms. diff --git a/source/blender/blenlib/BLI_string_utf8.h b/source/blender/blenlib/BLI_string_utf8.h index b633bbfa435..65d9d7863c3 100644 --- a/source/blender/blenlib/BLI_string_utf8.h +++ b/source/blender/blenlib/BLI_string_utf8.h @@ -103,6 +103,7 @@ int BLI_str_utf8_offset_from_column(const char *str, int column); #define BLI_UTF8_WIDTH_MAX 2 /* columns */ #define BLI_UTF8_ERR ((unsigned int)-1) +/* -------------------------------------------------------------------- */ /** \name String Copy/Format Macros * Avoid repeating destination with `sizeof(..)`. * \note `ARRAY_SIZE` allows pointers on some platforms. diff --git a/source/blender/blenlib/intern/BLI_heap.c b/source/blender/blenlib/intern/BLI_heap.c index d20f0ce49d0..a221820d4c4 100644 --- a/source/blender/blenlib/intern/BLI_heap.c +++ b/source/blender/blenlib/intern/BLI_heap.c @@ -67,6 +67,7 @@ struct Heap { } nodes; }; +/* -------------------------------------------------------------------- */ /** \name Internal Functions * \{ */ @@ -146,6 +147,7 @@ static void heap_up(Heap *heap, uint i) /** \} */ +/* -------------------------------------------------------------------- */ /** \name Internal Memory Management * \{ */ @@ -187,6 +189,7 @@ static void heap_node_free(Heap *heap, HeapNode *node) /** \} */ +/* -------------------------------------------------------------------- */ /** \name Public Heap API * \{ */ diff --git a/source/blender/blenlib/intern/array_store.c b/source/blender/blenlib/intern/array_store.c index a6a0c21b104..85d480593e5 100644 --- a/source/blender/blenlib/intern/array_store.c +++ b/source/blender/blenlib/intern/array_store.c @@ -112,6 +112,7 @@ /* only for BLI_array_store_is_valid */ #include "BLI_ghash.h" +/* -------------------------------------------------------------------- */ /** \name Defines * * Some of the logic for merging is quite involved, @@ -206,6 +207,7 @@ /** \} */ +/* -------------------------------------------------------------------- */ /** \name Internal Structs * \{ */ @@ -313,6 +315,7 @@ typedef struct BTableRef { static size_t bchunk_list_size(const BChunkList *chunk_list); +/* -------------------------------------------------------------------- */ /** \name Internal BChunk API * \{ */ @@ -360,6 +363,7 @@ static bool bchunk_data_compare(const BChunk *chunk, /** \} */ +/* -------------------------------------------------------------------- */ /** \name Internal BChunkList API * \{ */ @@ -732,10 +736,11 @@ static void bchunk_list_fill_from_array(const BArrayInfo *info, /** \} */ -/* --------------------------------------------------------------------------- +/* * Internal Table Lookup Functions */ +/* -------------------------------------------------------------------- */ /** \name Internal Hashing/De-Duplication API * * Only used by #bchunk_list_from_data_merge @@ -1005,6 +1010,7 @@ static const BChunkRef *table_lookup(const BArrayInfo *info, /** \} */ +/* -------------------------------------------------------------------- */ /** \name Main Data De-Duplication Function * * \{ */ @@ -1390,6 +1396,7 @@ static BChunkList *bchunk_list_from_data_merge(const BArrayInfo *info, /** \} */ +/* -------------------------------------------------------------------- */ /** \name Main Array Storage API * \{ */ @@ -1496,6 +1503,7 @@ void BLI_array_store_clear(BArrayStore *bs) /** \} */ +/* -------------------------------------------------------------------- */ /** \name BArrayStore Statistics * \{ */ @@ -1530,6 +1538,7 @@ size_t BLI_array_store_calc_size_compacted_get(const BArrayStore *bs) /** \} */ +/* -------------------------------------------------------------------- */ /** \name BArrayState Access * \{ */ @@ -1653,6 +1662,7 @@ void *BLI_array_store_state_data_get_alloc(BArrayState *state, size_t *r_data_le /** \} */ +/* -------------------------------------------------------------------- */ /** \name Debugging API (for testing). * \{ */ diff --git a/source/blender/blenlib/intern/boxpack_2d.c b/source/blender/blenlib/intern/boxpack_2d.c index 250a3fdf21b..9840dc77148 100644 --- a/source/blender/blenlib/intern/boxpack_2d.c +++ b/source/blender/blenlib/intern/boxpack_2d.c @@ -97,6 +97,7 @@ BLI_INLINE int quad_flag(uint q) #define TL 2 #define BR 3 +/* -------------------------------------------------------------------- */ /** \name Box Accessor Functions * \{ */ @@ -121,6 +122,7 @@ static float box_ymax_get(const BoxPack *box) } /** \} */ +/* -------------------------------------------------------------------- */ /** \name Box Placement * \{ */ @@ -165,6 +167,7 @@ static void box_ymax_set(BoxPack *box, const float f) } /** \} */ +/* -------------------------------------------------------------------- */ /** \name Box Utils * \{ */ @@ -203,6 +206,7 @@ static void vert_bias_update(BoxVert *v) printf("\tBox Debug i %i, w:%.3f h:%.3f x:%.3f y:%.3f\n", b->index, b->w, b->h, b->x, b->y) #endif +/* -------------------------------------------------------------------- */ /** \name Box/Vert Sorting * \{ */ diff --git a/source/blender/blenlib/intern/convexhull_2d.c b/source/blender/blenlib/intern/convexhull_2d.c index 6e4a8623077..a3d24787d27 100644 --- a/source/blender/blenlib/intern/convexhull_2d.c +++ b/source/blender/blenlib/intern/convexhull_2d.c @@ -37,6 +37,7 @@ * http://softsurfer.com/Archive/algorithm_0203/algorithm_0203.htm */ +/* -------------------------------------------------------------------- */ /** \name Main Convex-Hull Calculation * \{ */ @@ -227,9 +228,9 @@ int BLI_convexhull_2d(const float (*points)[2], const int n, int r_points[]) /** \} */ -/* -------------------------------------------------------------------- */ /* Helper functions */ +/* -------------------------------------------------------------------- */ /** \name Utility Convex-Hull Functions * \{ */ diff --git a/source/blender/blenlib/intern/math_color_inline.c b/source/blender/blenlib/intern/math_color_inline.c index 85aabbb672a..1264620cf36 100644 --- a/source/blender/blenlib/intern/math_color_inline.c +++ b/source/blender/blenlib/intern/math_color_inline.c @@ -261,6 +261,7 @@ MINLINE void cpack_cpy_3ub(unsigned char r_col[3], const unsigned int pack) r_col[2] = ((pack) >> 16) & 0xFF; } +/* -------------------------------------------------------------------- */ /** \name RGB/Grayscale Functions * * \warning diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index 2f913a294e0..dcdc7c4d668 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -4181,6 +4181,7 @@ int interp_sparse_array(float *array, const int list_size, const float skipval) return 1; } +/* -------------------------------------------------------------------- */ /** \name interp_weights_poly_v2, v3 * \{ */ diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c index 656f37c9f18..cf6945529f2 100644 --- a/source/blender/blenlib/intern/math_matrix.c +++ b/source/blender/blenlib/intern/math_matrix.c @@ -535,8 +535,10 @@ void mul_m3_m4m4(float R[3][3], const float A[4][4], const float B[4][4]) R[2][2] = B[2][0] * A[0][2] + B[2][1] * A[1][2] + B[2][2] * A[2][2]; } +/* -------------------------------------------------------------------- */ /** \name Macro helpers for: mul_m3_series * \{ */ + void _va_mul_m3_series_3(float r[3][3], const float m1[3][3], const float m2[3][3]) { mul_m3_m3m3(r, m1, m2); @@ -621,8 +623,10 @@ void _va_mul_m3_series_9(float r[3][3], } /** \} */ +/* -------------------------------------------------------------------- */ /** \name Macro helpers for: mul_m4_series * \{ */ + void _va_mul_m4_series_3(float r[4][4], const float m1[4][4], const float m2[4][4]) { mul_m4_m4m4(r, m1, m2); diff --git a/source/blender/blenlib/intern/math_vector.c b/source/blender/blenlib/intern/math_vector.c index 4d7efa4b6f4..5f3297134c6 100644 --- a/source/blender/blenlib/intern/math_vector.c +++ b/source/blender/blenlib/intern/math_vector.c @@ -162,6 +162,7 @@ void interp_v2_v2v2_slerp_safe(float target[2], const float a[2], const float b[ } } +/* -------------------------------------------------------------------- */ /** \name Cubic curve interpolation (bezier spline). * \{ */ @@ -1395,6 +1396,7 @@ void copy_vn_fl(float *array_tar, const int size, const float val) } } +/* -------------------------------------------------------------------- */ /** \name Double precision versions 'db'. * \{ */ diff --git a/source/blender/blenlib/intern/math_vector_inline.c b/source/blender/blenlib/intern/math_vector_inline.c index f6841ef52b0..f17b7535258 100644 --- a/source/blender/blenlib/intern/math_vector_inline.c +++ b/source/blender/blenlib/intern/math_vector_inline.c @@ -1288,6 +1288,7 @@ MINLINE bool is_one_v3(const float v[3]) return (v[0] == 1.0f && v[1] == 1.0f && v[2] == 1.0f); } +/* -------------------------------------------------------------------- */ /** \name Vector Comparison * * \note use ``value <= limit``, so a limit of zero doesn't fail on an exact match. @@ -1395,6 +1396,7 @@ MINLINE bool compare_size_v3v3(const float v1[3], const float v2[3], const float return true; } +/* -------------------------------------------------------------------- */ /** \name Vector Clamping * \{ */ diff --git a/source/blender/blenlib/intern/rct.c b/source/blender/blenlib/intern/rct.c index bec5f0ab3ba..61e0ec393cb 100644 --- a/source/blender/blenlib/intern/rct.c +++ b/source/blender/blenlib/intern/rct.c @@ -1085,9 +1085,9 @@ void print_rcti(const char *str, const rcti *rect) BLI_rcti_size_y(rect)); } -/* -------------------------------------------------------------------- */ /* Comprehensive math (float only) */ +/* -------------------------------------------------------------------- */ /** \name Rect math functions * \{ */ diff --git a/source/blender/blenlib/intern/smallhash.c b/source/blender/blenlib/intern/smallhash.c index a091b41af23..5961893cae3 100644 --- a/source/blender/blenlib/intern/smallhash.c +++ b/source/blender/blenlib/intern/smallhash.c @@ -349,6 +349,7 @@ void **BLI_smallhash_iternew_p(const SmallHash *sh, SmallHashIter *iter, uintptr return BLI_smallhash_iternext_p(iter, key); } +/* -------------------------------------------------------------------- */ /** \name Debugging & Introspection * \{ */ |