blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 747 Projects 19 Wiki Activity

Initial Grease Pencil 3.0 stage #106848

Merged
Falk David merged 224 commits from filedescriptor/blender:grease-pencil-v3 into main 2023-05-30 11:14:22 +02:00
Conversation 8 Commits 224 Files Changed 94 +2 -33
1 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b54b24ede2 - Show all commits

35
source/blender/draw/intern/draw_cache_impl_grease_pencil.cc
View File

@ -1,4 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/* SPDX-License-Identifier: GPL-2.0-or-later
* Copyright 2023 Blender Foundation. */
/** \file
* \ingroup draw
@ -11,7 +12,6 @@
#include "BKE_grease_pencil.hh"
#include "BLI_task.hh"
#include "BLI_timeit.hh"
#include "DNA_grease_pencil_types.h"
@ -158,35 +158,6 @@ static GreasePencilBatchCache *grease_pencil_batch_cache_get(GreasePencil &greas
/** \name Vertex Buffers
* \{ */
static int count_cyclic_curves(bke::CurvesGeometry &curves)
{
VArray<bool> cyclic = curves.cyclic();
const CommonVArrayInfo info = cyclic.common_info();
if (info.type == CommonVArrayInfo::Type::Single) {
const bool single = *static_cast<const bool *>(info.data);
return single ? curves.curves_num() : 0;
}
else if (info.type == CommonVArrayInfo::Type::Span) {
const Span<bool> span(static_cast<const bool *>(info.data), cyclic.size());
return span.count(true);
}
return threading::parallel_reduce(
cyclic.index_range(),
2048,
0,
[&](const IndexRange range, const int init) {
/* Alternatively, this could use #materialize to retrieve many values at once. */
int sum = init;
for (const int64_t i : range) {
if (cyclic[i]) {
sum++;
}
}
return sum;
},
[&](const int a, const int b) { return a + b; });
}
BLI_INLINE int32_t pack_rotation_aspect_hardness(float rot, float asp, float hard)
{
int32_t packed = 0;
@ -220,8 +191,6 @@ static void grease_pencil_batches_ensure(GreasePencil &grease_pencil, int cfra)
return;
}
SCOPED_TIMER("grease_pencil_batches_ensure");
/* Should be discarded together. */
BLI_assert(cache->vbo == nullptr && cache->ibo == nullptr);
BLI_assert(cache->geom_batch == nullptr);