griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Sculpt: Reorder function to avoid forward declaration

Browse Source
This commit is contained in:
Hans Goudey
2024-06-06 22:09:23 -04:00
committed by Hans Goudey
parent c18d209b85
commit 279fda3dcd
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/blender/draw/intern/draw_pbvh.cc
View File

@@ -357,11 +357,6 @@ struct PBVHBatches {
void create_index(const PBVH_GPU_Args &args);
};
static PBVHBatch create_batch(PBVHBatches &batches,
const Span<AttributeRequest> requests,
const PBVH_GPU_Args &args,
bool do_coarse_grids);
static int count_faces(const PBVH_GPU_Args &args)
{
int count = 0;
@@ -450,19 +445,6 @@ int PBVHBatches::ensure_vbo(const AttributeRequest &request, const PBVH_GPU_Args
return this->create_vbo(request, args);
}
static PBVHBatch &ensure_batch(PBVHBatches &batches,
const Span<AttributeRequest> requests,
const PBVH_GPU_Args &args,
const bool do_coarse_grids)
{
std::string key = build_key(requests, do_coarse_grids);
if (PBVHBatch *batch = batches.batches.lookup_ptr(key)) {
return *batch;
}
return batches.batches.lookup_or_add(std::move(key),
create_batch(batches, requests, args, do_coarse_grids));
}
static void fill_vbo_normal_faces(const PBVH_GPU_Args &args, gpu::VertBuf &vert_buf)
{
const bke::AttributeAccessor attributes = args.mesh->attributes();
@@ -1417,6 +1399,19 @@ static PBVHBatch create_batch(PBVHBatches &batches,
return batch;
}
static PBVHBatch &ensure_batch(PBVHBatches &batches,
const Span<AttributeRequest> requests,
const PBVH_GPU_Args &args,
const bool do_coarse_grids)
{
std::string key = build_key(requests, do_coarse_grids);
if (PBVHBatch *batch = batches.batches.lookup_ptr(key)) {
return *batch;
}
return batches.batches.lookup_or_add(std::move(key),
create_batch(batches, requests, args, do_coarse_grids));
}
void node_update(PBVHBatches *batches, const PBVH_GPU_Args &args)
{
batches->update(args);