blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

sculpt-dev: remove debug ATTR_NO_OPTS

This commit is contained in:
Joseph Eagar 2021-11-17 15:32:44 -08:00
parent 5ce01b8ce8
commit 7d870c75fb
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/intern/pbvh.c
View File

@ -1445,7 +1445,7 @@ bool BKE_pbvh_get_color_layer(PBVH *pbvh,
}
}
ATTR_NO_OPT static void pbvh_update_draw_buffer_cb(void *__restrict userdata,
static void pbvh_update_draw_buffer_cb(void *__restrict userdata,
const int n,
const TaskParallelTLS *__restrict UNUSED(tls))
{
@ -1545,7 +1545,7 @@ ATTR_NO_OPT static void pbvh_update_draw_buffer_cb(void *__restrict userdata,
AttributeDomain domain;
BKE_pbvh_get_color_layer(pbvh, pbvh->mesh, &cl, &domain);
GPU_pbvh_mesh_buffers_update(node->draw_buffers,
pbvh->verts,
vdata,
@ -1553,7 +1553,7 @@ ATTR_NO_OPT static void pbvh_update_draw_buffer_cb(void *__restrict userdata,
CustomData_get_layer(pbvh->vdata, CD_PAINT_MASK),
cl,
render_vcol_layer,
domain,
domain,
CustomData_get_layer(pbvh->pdata, CD_SCULPT_FACE_SETS),
pbvh->face_sets_color_seed,
pbvh->face_sets_color_default,
@ -1743,7 +1743,7 @@ static void pbvh_update_draw_buffers(
.pbvh = pbvh, .nodes = nodes, .flat_vcol_shading = pbvh->flat_vcol_shading, .mesh = me};
TaskParallelSettings settings;
BKE_pbvh_parallel_range_settings(&settings, false /*XXX*/, totnode);
BKE_pbvh_parallel_range_settings(&settings, true, totnode);
BLI_task_parallel_range(0, totnode, &data, pbvh_update_draw_buffer_cb, &settings);
for (int i = 0; i < totnode; i++) {

4
source/blender/draw/engines/workbench/workbench_engine.c
View File

@ -104,7 +104,7 @@ static struct GPUBatch **workbench_object_surface_material_get(Object *ob)
return DRW_cache_object_surface_material_get(ob, gpumat_array, materials_len);
}
ATTR_NO_OPT static void workbench_cache_sculpt_populate(WORKBENCH_PrivateData *wpd,
static void workbench_cache_sculpt_populate(WORKBENCH_PrivateData *wpd,
Object *ob,
eV3DShadingColorType color_type)
{
@ -241,7 +241,7 @@ static void workbench_cache_hair_populate(WORKBENCH_PrivateData *wpd,
* Decide what color-type to draw the object with.
* In some cases it can be overwritten by #workbench_material_setup().
*/
ATTR_NO_OPT static eV3DShadingColorType workbench_color_type_get(WORKBENCH_PrivateData *wpd,
static eV3DShadingColorType workbench_color_type_get(WORKBENCH_PrivateData *wpd,
Object *ob,
bool *r_sculpt_pbvh,
bool *r_texpaint_mode,

2
source/blender/draw/engines/workbench/workbench_materials.c
View File

@ -158,7 +158,7 @@ BLI_INLINE bool workbench_material_chunk_select(WORKBENCH_PrivateData *wpd,
return resource_changed;
}
ATTR_NO_OPT DRWShadingGroup *workbench_material_setup_ex(WORKBENCH_PrivateData *wpd,
DRWShadingGroup *workbench_material_setup_ex(WORKBENCH_PrivateData *wpd,
Object *ob,
int mat_nr,
eV3DShadingColorType color_type,

2
source/blender/draw/engines/workbench/workbench_shader.c
View File

@ -139,7 +139,7 @@ void workbench_shader_library_ensure(void)
}
}
ATTR_NO_OPT static char *workbench_build_defines(
static char *workbench_build_defines(
WORKBENCH_PrivateData *wpd, bool textured, bool tiled, bool cavity, bool curvature)
{
char *str = NULL;

30
source/blender/gpu/intern/gpu_buffers.c
View File

@ -481,7 +481,7 @@ static bool gpu_pbvh_is_looptri_visible(const MLoopTri *lt,
}
/* Threaded - do not call any functions that use OpenGL calls! */
ATTR_NO_OPT void GPU_pbvh_mesh_buffers_update(GPU_PBVH_Buffers *buffers,
void GPU_pbvh_mesh_buffers_update(GPU_PBVH_Buffers *buffers,
const MVert *mvert,
const CustomData *vdata,
const CustomData *ldata,
@ -496,7 +496,7 @@ ATTR_NO_OPT void GPU_pbvh_mesh_buffers_update(GPU_PBVH_Buffers *buffers,
{
GPUAttrRef vcol_refs[MAX_GPU_ATTR];
GPUAttrRef cd_uvs[MAX_GPU_ATTR];
int totcol = gpu_pbvh_gpu_make_attr_offs(ATTR_DOMAIN_MASK_POINT | ATTR_DOMAIN_MASK_CORNER,
CD_MASK_PROP_COLOR | CD_MASK_MLOOPCOL,
vdata,
@ -1413,18 +1413,18 @@ void GPU_pbvh_bmesh_buffers_update_free(GPU_PBVH_Buffers *buffers)
GPU_INDEXBUF_DISCARD_SAFE(buffers->index_lines_buf);
}
ATTR_NO_OPT static int gpu_pbvh_gpu_make_attr_offs(AttributeDomainMask domain_mask,
CustomDataMask type_mask,
const CustomData *vdata,
const CustomData *edata,
const CustomData *ldata,
const CustomData *pdata,
GPUAttrRef r_cd_vcols[MAX_GPU_ATTR],
bool active_only,
int active_type,
int active_domain,
const CustomDataLayer *active_vcol_layer,
const CustomDataLayer *render_vcol_layer)
static int gpu_pbvh_gpu_make_attr_offs(AttributeDomainMask domain_mask,
CustomDataMask type_mask,
const CustomData *vdata,
const CustomData *edata,
const CustomData *ldata,
const CustomData *pdata,
GPUAttrRef r_cd_vcols[MAX_GPU_ATTR],
bool active_only,
int active_type,
int active_domain,
const CustomDataLayer *active_vcol_layer,
const CustomDataLayer *render_vcol_layer)
{
if (active_only) {
const CustomData *cdata = active_domain == ATTR_DOMAIN_POINT ? vdata : ldata;
@ -1529,7 +1529,7 @@ static bool gpu_pbvh_format_equals(PBVHGPUFormat *a, PBVHGPUFormat *b)
return !bad;
}
ATTR_NO_OPT bool GPU_pbvh_update_attribute_names(CustomData *vdata,
bool GPU_pbvh_update_attribute_names(CustomData *vdata,
CustomData *ldata,
bool need_full_render,
bool fast_mode,