blender/blender
152
489
Fork 720
Code Issues 6.8k Pull Requests 893 Projects 18 Wiki Activity

Cleanup: BLI: Merge files #126169

Merged
Jacques Lucke merged 3 commits from mod_moder/blender:index_range_extra_imp_file into main 2024-08-13 20:27:11 +02:00
Conversation 0 Commits 3 Files Changed 3 +31 -43
3 changed files with 31 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenlib/CMakeLists.txt
View File

@ -31,7 +31,6 @@ set(SRC
intern/BLI_ghash_utils.cc
intern/BLI_heap.c
intern/BLI_heap_simple.c
intern/BLI_index_range.cc
intern/BLI_kdopbvh.c
intern/BLI_linklist.c
intern/BLI_linklist_lockfree.c

42
source/blender/blenlib/intern/BLI_index_range.cc
View File

@ -1,42 +0,0 @@
/* SPDX-FileCopyrightText: 2023 Blender Authors
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include <mutex>
#include "BLI_index_range.hh"
#include "BLI_utildefines.h"
namespace blender {
AlignedIndexRanges split_index_range_by_alignment(const IndexRange range, const int64_t alignment)
{
BLI_assert(is_power_of_2(alignment));
const int64_t mask = alignment - 1;
AlignedIndexRanges aligned_ranges;
const int64_t start_chunk = range.start() & ~mask;
const int64_t end_chunk = range.one_after_last() & ~mask;
if (start_chunk == end_chunk) {
aligned_ranges.prefix = range;
}
else {
int64_t prefix_size = 0;
int64_t suffix_size = 0;
if (range.start() != start_chunk) {
prefix_size = alignment - (range.start() & mask);
}
if (range.one_after_last() != end_chunk) {
suffix_size = range.one_after_last() - end_chunk;
}
aligned_ranges.prefix = IndexRange(range.start(), prefix_size);
aligned_ranges.suffix = IndexRange(end_chunk, suffix_size);
aligned_ranges.aligned = IndexRange(aligned_ranges.prefix.one_after_last(),
range.size() - prefix_size - suffix_size);
}
return aligned_ranges;
}
} // namespace blender

31
source/blender/blenlib/intern/index_range.cc
View File

@ -3,11 +3,42 @@
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "BLI_index_range.hh"
mod_moder marked this conversation as resolved Outdated
Jacques Lucke commented 2024-08-13 19:57:54 +02:00
Outdated
Review
Copy Link

This include does not seem necessary by the function.

This include does not seem necessary by the function.
#include "BLI_utildefines.h"
#include <ostream>
namespace blender {
AlignedIndexRanges split_index_range_by_alignment(const IndexRange range, const int64_t alignment)
{
BLI_assert(is_power_of_2(alignment));
const int64_t mask = alignment - 1;
AlignedIndexRanges aligned_ranges;
const int64_t start_chunk = range.start() & ~mask;
const int64_t end_chunk = range.one_after_last() & ~mask;
if (start_chunk == end_chunk) {
aligned_ranges.prefix = range;
}
else {
int64_t prefix_size = 0;
int64_t suffix_size = 0;
if (range.start() != start_chunk) {
prefix_size = alignment - (range.start() & mask);
}
if (range.one_after_last() != end_chunk) {
suffix_size = range.one_after_last() - end_chunk;
}
aligned_ranges.prefix = IndexRange(range.start(), prefix_size);
aligned_ranges.suffix = IndexRange(end_chunk, suffix_size);
aligned_ranges.aligned = IndexRange(aligned_ranges.prefix.one_after_last(),
range.size() - prefix_size - suffix_size);
}
return aligned_ranges;
}
std::ostream &operator<<(std::ostream &stream, IndexRange range)
{
stream << '[' << range.start() << ", " << range.one_after_last() << ')';