BLI_bitmap: add functions operating on the whole bitmask.
authorAlexander Gavrilov <angavrilov@gmail.com>
Sat, 15 Dec 2018 08:47:24 +0000 (11:47 +0300)
committerAlexander Gavrilov <angavrilov@gmail.com>
Wed, 19 Dec 2018 12:53:12 +0000 (15:53 +0300)
There is no point having operations that iterate over the whole
bit array as macros, so convert BLI_BITMAP_SET_ALL to a function.
Also, add more utilities for copying and manipulating masks.

Reviewers: brecht, campbellbarton

Differential Revision: https://developer.blender.org/D4101

source/blender/blenkernel/intern/bvhutils.c
source/blender/blenkernel/intern/mesh_evaluate.c
source/blender/blenkernel/intern/mesh_remap.c
source/blender/blenkernel/intern/multires.c
source/blender/blenkernel/intern/subdiv_foreach.c
source/blender/blenlib/BLI_bitmap.h
source/blender/blenlib/CMakeLists.txt
source/blender/blenlib/intern/astar.c
source/blender/blenlib/intern/bitmap.c [new file with mode: 0644]
source/blender/windowmanager/intern/wm_files_link.c

index 83b18a57ba47e6c44796267e9d32a82cdb017745..c264eb8a1d219a7ce90908950a016b2dd68ef2af 100644 (file)
@@ -1043,7 +1043,7 @@ static BLI_bitmap *loose_verts_map_get(
         int *r_loose_vert_num)
 {
        BLI_bitmap *loose_verts_mask = BLI_BITMAP_NEW(verts_num, __func__);
-       BLI_BITMAP_SET_ALL(loose_verts_mask, true, verts_num);
+       BLI_bitmap_set_all(loose_verts_mask, true, verts_num);
 
        const MEdge *e = medge;
        int num_linked_verts = 0;
index b6ba4a15e400add038d472007d7d261aeb1a3440..c5bcb72165eff330fdc269fc6b68bdb8af9ba5bd 100644 (file)
@@ -1769,7 +1769,7 @@ static void mesh_normals_loop_custom_set(
                        &lnors_spacearr, NULL, loop_to_poly);
        }
        else {
-               BLI_BITMAP_SET_ALL(done_loops, true, (size_t)numLoops);
+               BLI_bitmap_set_all(done_loops, true, (size_t)numLoops);
        }
 
        /* And we just have to convert plain object-space custom normals to our lnor space-encoded ones. */
index bdf5b3fddcce9211e06c19b0b95597f63dc7eda4..85b09848a723a31dbc9013ab4e39bed4d91a2357 100644 (file)
@@ -1336,7 +1336,7 @@ void BKE_mesh_remap_calc_loops_from_mesh(
                                for (tindex = 0; tindex < num_trees; tindex++) {
                                        MeshElemMap *isld = island_store.islands[tindex];
                                        int num_verts_active = 0;
-                                       BLI_BITMAP_SET_ALL(verts_active, false, (size_t)num_verts_src);
+                                       BLI_bitmap_set_all(verts_active, false, (size_t)num_verts_src);
                                        for (i = 0; i < isld->count; i++) {
                                                mp_src = &polys_src[isld->indices[i]];
                                                for (lidx_src = mp_src->loopstart; lidx_src < mp_src->loopstart + mp_src->totloop; lidx_src++) {
@@ -1370,7 +1370,7 @@ void BKE_mesh_remap_calc_loops_from_mesh(
 
                                for (tindex = 0; tindex < num_trees; tindex++) {
                                        int num_looptri_active = 0;
-                                       BLI_BITMAP_SET_ALL(looptri_active, false, (size_t)num_looptri_src);
+                                       BLI_bitmap_set_all(looptri_active, false, (size_t)num_looptri_src);
                                        for (i = 0; i < num_looptri_src; i++) {
                                                mp_src = &polys_src[looptri_src[i].poly];
                                                if (island_store.items_to_islands[mp_src->loopstart] == tindex) {
index a21e919bca72db1f0ed1828e2ba3785fd49ad8d4..d2f307362e6da4aac6976bd3dbd019141dc87168 100644 (file)
@@ -275,7 +275,7 @@ static MDisps *multires_mdisps_initialize_hidden(Mesh *me, int level)
                        BLI_assert(!md->hidden);
 
                        md->hidden = BLI_BITMAP_NEW(gridarea, "MDisps.hidden initialize");
-                       BLI_BITMAP_SET_ALL(md->hidden, true, gridarea);
+                       BLI_bitmap_set_all(md->hidden, true, gridarea);
                }
        }
 
index 511536c31b59fe0e8f12c0a5308675b316287047..f049b23a9efe4d2f4a855412b2974dc438f02c80 100644 (file)
@@ -288,7 +288,7 @@ static void subdiv_foreach_ctx_init(Subdiv *subdiv,
        /* Calculate number of geometry in the result subdivision mesh. */
        subdiv_foreach_ctx_count(ctx);
        /* Re-set maps which were used at this step. */
-       BLI_BITMAP_SET_ALL(ctx->coarse_edges_used_map, false, coarse_mesh->totedge);
+       BLI_bitmap_set_all(ctx->coarse_edges_used_map, false, coarse_mesh->totedge);
        ctx->face_ptex_offset = BKE_subdiv_face_ptex_offset_get(subdiv);
 }
 
index 8e873c76dc965b5275d4be063398daf438959a52..c3be39c5bc58e12340f7f29c17c799f818f51773 100644 (file)
@@ -107,16 +107,6 @@ typedef unsigned int BLI_bitmap;
                        BLI_BITMAP_DISABLE(_bitmap, _index); \
        } (void)0
 
-/* set or clear the value of the whole bitmap (needs size info) */
-#define BLI_BITMAP_SET_ALL(_bitmap, _set, _tot) \
-       { \
-               CHECK_TYPE(_bitmap, BLI_bitmap *); \
-               if (_set) \
-                       memset(_bitmap, UCHAR_MAX, BLI_BITMAP_SIZE(_tot)); \
-               else \
-                       memset(_bitmap, 0, BLI_BITMAP_SIZE(_tot)); \
-       } (void)0
-
 /* resize bitmap to have space for '_tot' bits */
 #define BLI_BITMAP_RESIZE(_bitmap, _tot) \
        { \
@@ -124,4 +114,10 @@ typedef unsigned int BLI_bitmap;
                (_bitmap) = MEM_reallocN(_bitmap, BLI_BITMAP_SIZE(_tot)); \
        } (void)0
 
+void BLI_bitmap_set_all(BLI_bitmap *bitmap, bool set, size_t bits);
+void BLI_bitmap_flip_all(BLI_bitmap *bitmap, size_t bits);
+void BLI_bitmap_copy_all(BLI_bitmap *dst, const BLI_bitmap *src, size_t bits);
+void BLI_bitmap_and_all(BLI_bitmap *dst, const BLI_bitmap *src, size_t bits);
+void BLI_bitmap_or_all(BLI_bitmap *dst, const BLI_bitmap *src, size_t bits);
+
 #endif
index 921ecc29e18b8dce60e29ffb43423266bbc70854..90d24d0b84e9231328f3ac0fff57a1c8afc87ec8 100644 (file)
@@ -62,6 +62,7 @@ set(SRC
        intern/array_store_utils.c
        intern/array_utils.c
        intern/astar.c
+       intern/bitmap.c
        intern/bitmap_draw_2d.c
        intern/boxpack_2d.c
        intern/buffer.c
index ff4dfea2401996bd4684c30efed292d4ac92666d..4a94c385b59a08fbbbc7228aff7941d962e0498b 100644 (file)
@@ -216,7 +216,7 @@ bool BLI_astar_graph_solve(
 
        r_solution->steps = 0;
        prev_nodes[node_index_src] = -1;
-       BLI_BITMAP_SET_ALL(done_nodes, false, as_graph->node_num);
+       BLI_bitmap_set_all(done_nodes, false, as_graph->node_num);
        copy_vn_fl(g_costs, as_graph->node_num, FLT_MAX);
        g_costs[node_index_src] = 0.0f;
        g_steps[node_index_src] = 0;
diff --git a/source/blender/blenlib/intern/bitmap.c b/source/blender/blenlib/intern/bitmap.c
new file mode 100644 (file)
index 0000000..fab8b3d
--- /dev/null
@@ -0,0 +1,75 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2012 by Nicholas Bishop
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/blenlib/intern/bitmap.c
+ *  \ingroup bli
+ *
+ * Utility functions for variable size bitmasks.
+ */
+
+#include <string.h>
+#include <limits.h>
+
+#include "BLI_utildefines.h"
+#include "BLI_bitmap.h"
+
+/** Set or clear all bits in the bitmap. */
+void BLI_bitmap_set_all(BLI_bitmap *bitmap, bool set, size_t bits)
+{
+       memset(bitmap, set ? UCHAR_MAX : 0, BLI_BITMAP_SIZE(bits));
+}
+
+/** Invert all bits in the bitmap. */
+void BLI_bitmap_flip_all(BLI_bitmap *bitmap, size_t bits)
+{
+       size_t num_blocks = _BITMAP_NUM_BLOCKS(bits);
+       for (size_t i = 0; i < num_blocks; i++) {
+               bitmap[i] ^= ~(BLI_bitmap)0;
+       }
+}
+
+/** Copy all bits from one bitmap to another. */
+void BLI_bitmap_copy_all(BLI_bitmap *dst, const BLI_bitmap *src, size_t bits)
+{
+       memcpy(dst, src, BLI_BITMAP_SIZE(bits));
+}
+
+/** Combine two bitmaps with boolean AND. */
+void BLI_bitmap_and_all(BLI_bitmap *dst, const BLI_bitmap *src, size_t bits)
+{
+       size_t num_blocks = _BITMAP_NUM_BLOCKS(bits);
+       for (size_t i = 0; i < num_blocks; i++) {
+               dst[i] &= src[i];
+       }
+}
+
+/** Combine two bitmaps with boolean OR. */
+void BLI_bitmap_or_all(BLI_bitmap *dst, const BLI_bitmap *src, size_t bits)
+{
+       size_t num_blocks = _BITMAP_NUM_BLOCKS(bits);
+       for (size_t i = 0; i < num_blocks; i++) {
+               dst[i] |= src[i];
+       }
+}
index bc21276ff45f42f7665ce1bbdb24192d542bc37d..07ed7a8f59e7eacca4c8a08ba6e0edd1d5217fa4 100644 (file)
@@ -270,7 +270,7 @@ static void wm_link_do(
                        if (new_id) {
                                /* If the link is successful, clear item's libs 'todo' flags.
                                 * This avoids trying to link same item with other libraries to come. */
-                               BLI_BITMAP_SET_ALL(item->libraries, false, lapp_data->num_libraries);
+                               BLI_bitmap_set_all(item->libraries, false, lapp_data->num_libraries);
                                item->new_id = new_id;
                        }
                }
@@ -633,7 +633,7 @@ static void lib_relocate_do(
                                /* Note that non-linkable IDs (like e.g. shapekeys) are also explicitly linked here... */
                                BLI_remlink(lbarray[lba_idx], id);
                                item = wm_link_append_data_item_add(lapp_data, id->name + 2, idcode, id);
-                               BLI_BITMAP_SET_ALL(item->libraries, true, lapp_data->num_libraries);
+                               BLI_bitmap_set_all(item->libraries, true, lapp_data->num_libraries);
 
 #ifdef PRINT_DEBUG
                                printf("\tdatablock to seek for: %s\n", id->name);