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

DRW: Optimize adjacency data creation a bit 

This is a very small improvement and only concerns wireframe update.

My tests.
old 6fps > new 7fps > baseline (wireframe disabled) 10fps
This commit is contained in:
Clément Foucault 2018-12-05 22:38:02 +01:00
parent d6454a15f7
commit 5103fa4ae7
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/draw/intern/draw_cache_impl_mesh.c
View File

@ -4248,11 +4248,14 @@ static GPUIndexBuf *mesh_batch_cache_get_edges_adjacency(MeshRenderData *rdata,
}
#undef NO_EDGE
static EdgeHash *create_looptri_edge_adjacency_hash(MeshRenderData *rdata)
static EdgeHash *create_looptri_edge_adjacency_hash(MeshRenderData *rdata, EdgeAdjacentVerts **r_adj_data)
{
const int tri_len = mesh_render_data_looptri_len_get(rdata);
/* Create adjacency info in looptri */
EdgeHash *eh = BLI_edgehash_new_ex(__func__, tri_len * 3);
/* TODO allocate less memory (based on edge count) */
EdgeAdjacentVerts *adj_data = MEM_mallocN(tri_len * 3 * sizeof(EdgeAdjacentVerts), __func__);
*r_adj_data = adj_data;
/* Create edges for each pair of triangles sharing an edge. */
for (int i = 0; i < tri_len; i++) {
for (int e = 0; e < 3; e++) {
@ -4277,7 +4280,7 @@ static EdgeHash *create_looptri_edge_adjacency_hash(MeshRenderData *rdata)
EdgeAdjacentVerts **eav;
bool value_is_init = BLI_edgehash_ensure_p(eh, v1, v2, (void ***)&eav);
if (!value_is_init) {
*eav = MEM_mallocN(sizeof(**eav), "EdgeAdjacentVerts");
*eav = adj_data++;
(*eav)->vert_index[0] = v0;
(*eav)->vert_index[1] = -1;
}
@ -4313,7 +4316,8 @@ static GPUVertBuf *mesh_batch_cache_create_edges_overlay_texture_buf(
int vidx = 0;
int vidx_end = vbo_len_capacity;
EdgeHash *eh = NULL;
eh = create_looptri_edge_adjacency_hash(rdata);
EdgeAdjacentVerts *adj_data = NULL;
eh = create_looptri_edge_adjacency_hash(rdata, &adj_data);
for (int i = 0; i < tri_len; i++) {
uint vdata[3] = {0, 0, 0};
@ -4404,7 +4408,8 @@ static GPUVertBuf *mesh_batch_cache_create_edges_overlay_texture_buf(
cache->edges_face_overlay_tri_count_low = vidx / 3;
cache->edges_face_reduce_len = reduce_len;
BLI_edgehash_free(eh, MEM_freeN);
BLI_edgehash_free(eh, NULL);
MEM_freeN(adj_data);
return vbo;
}