bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Sculpt: Fix misleading naming of grids index buffer functions

Browse Source
This commit is contained in:
Hans Goudey 2024-06-27 11:28:45 -04:00
parent dc70f454b7
commit 9584f8fb55
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1079,16 +1079,16 @@ static void fill_vbo_bmesh(PBVHVbo &vbo, const PBVH_GPU_Args &args)
void PBVHBatches::update(const PBVH_GPU_Args &args) void PBVHBatches::update(const PBVH_GPU_Args &args)
{ {
if (!lines_index) { if (!this->lines_index) {
create_index(args); create_index(args);
} }
for (PBVHVbo &vbo : vbos) { for (PBVHVbo &vbo : this->vbos) {
switch (args.pbvh_type) { switch (args.pbvh_type) {
case PBVH_FACES: case PBVH_FACES:
fill_vbo_faces(vbo, args); fill_vbo_faces(vbo, args);
break; break;
case PBVH_GRIDS: case PBVH_GRIDS:
fill_vbo_grids(vbo, args, use_flat_layout); fill_vbo_grids(vbo, args, this->use_flat_layout);
break; break;
case PBVH_BMESH: case PBVH_BMESH:
fill_vbo_bmesh(vbo, args); fill_vbo_bmesh(vbo, args);
@ -1265,14 +1265,14 @@ static gpu::IndexBuf *create_index_bmesh(const PBVH_GPU_Args &args, const int vi
return GPU_indexbuf_build(&elb_lines); return GPU_indexbuf_build(&elb_lines);
} }
static void create_tris_from_grids(const PBVH_GPU_Args &args, static void create_grids_index(const PBVH_GPU_Args &args,
int display_gridsize, int display_gridsize,
GPUIndexBufBuilder &elb, GPUIndexBufBuilder &elb,
GPUIndexBufBuilder &elb_lines, GPUIndexBufBuilder &elb_lines,
const BitGroupVector<> &grid_hidden, const BitGroupVector<> &grid_hidden,
const int gridsize, const int gridsize,
const int skip, const int skip,
const int totgrid) const int totgrid)
{ {
uint offset = 0; uint offset = 0;
const uint grid_vert_len = gridsize * gridsize; const uint grid_vert_len = gridsize * gridsize;
@ -1314,14 +1314,14 @@ static void create_tris_from_grids(const PBVH_GPU_Args &args,
} }
} }
static void create_quads_from_grids(const PBVH_GPU_Args &args, static void create_grids_index_flat_layout(const PBVH_GPU_Args &args,
int display_gridsize, int display_gridsize,
GPUIndexBufBuilder &elb, GPUIndexBufBuilder &elb,
GPUIndexBufBuilder &elb_lines, GPUIndexBufBuilder &elb_lines,
const BitGroupVector<> &grid_hidden, const BitGroupVector<> &grid_hidden,
const int gridsize, const int gridsize,
const int skip, const int skip,
const int totgrid) const int totgrid)
{ {
uint offset = 0; uint offset = 0;
const uint grid_vert_len = square_uint(gridsize - 1) * 4; const uint grid_vert_len = square_uint(gridsize - 1) * 4;
@ -1450,11 +1450,11 @@ static void create_index_grids(const PBVH_GPU_Args &args,
INT_MAX); INT_MAX);
if (batches.use_flat_layout) { if (batches.use_flat_layout) {
create_quads_from_grids( create_grids_index_flat_layout(
args, display_gridsize, elb, elb_lines, grid_hidden, gridsize, skip, totgrid); args, display_gridsize, elb, elb_lines, grid_hidden, gridsize, skip, totgrid);
} }
else { else {
create_tris_from_grids( create_grids_index(
args, display_gridsize, elb, elb_lines, grid_hidden, gridsize, skip, totgrid); args, display_gridsize, elb, elb_lines, grid_hidden, gridsize, skip, totgrid);
} }