diff options
| -rw-r--r-- | source/blender/blenkernel/intern/pbvh.c | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/pbvh_intern.h | 5 | ||||
| -rw-r--r-- | source/blender/gpu/GPU_buffers.h | 5 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_buffers.c | 65 |
4 files changed, 9 insertions, 69 deletions
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index 611e409b0aa..65fc02c71c2 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -637,7 +637,6 @@ void BKE_pbvh_free(PBVH *bvh) BLI_gset_free(node->bm_other_verts, NULL); } } - GPU_pbvh_multires_buffers_free(&bvh->grid_common_gpu_buffer); if (bvh->deformed) { if (bvh->verts) { @@ -1122,7 +1121,7 @@ static void pbvh_update_draw_buffers(PBVH *bvh, PBVHNode **nodes, int totnode) node->totprim, bvh->grid_hidden, bvh->gridkey.grid_size, - &bvh->gridkey, &bvh->grid_common_gpu_buffer); + &bvh->gridkey); break; case PBVH_FACES: node->draw_buffers = diff --git a/source/blender/blenkernel/intern/pbvh_intern.h b/source/blender/blenkernel/intern/pbvh_intern.h index 4aef97bda47..ea8bd1933cd 100644 --- a/source/blender/blenkernel/intern/pbvh_intern.h +++ b/source/blender/blenkernel/intern/pbvh_intern.h @@ -144,11 +144,6 @@ struct PBVH { const DMFlagMat *grid_flag_mats; int totgrid; BLI_bitmap **grid_hidden; - /* index_buf of GPU_PBVH_Buffers can be the same for all 'fully drawn' nodes (same size). - * Previously was stored in a static var in gpu_buffer.c, but this breaks in case we handle several different - * objects in sculpt mode with different sizes at the same time, so now storing that common gpu buffer - * in an opaque pointer per pbvh. See T47637. */ - struct GridCommonGPUBuffer *grid_common_gpu_buffer; /* Only used during BVH build and update, * don't need to remain valid after */ diff --git a/source/blender/gpu/GPU_buffers.h b/source/blender/gpu/GPU_buffers.h index e60b5d60c30..42583e7387b 100644 --- a/source/blender/gpu/GPU_buffers.h +++ b/source/blender/gpu/GPU_buffers.h @@ -38,7 +38,6 @@ struct BMesh; struct CCGElem; struct CCGKey; struct DMFlagMat; -struct GridCommonGPUBuffer; struct GSet; struct MLoop; struct MLoopTri; @@ -58,8 +57,7 @@ GPU_PBVH_Buffers *GPU_pbvh_mesh_buffers_build( const int face_indices_len); GPU_PBVH_Buffers *GPU_pbvh_grid_buffers_build( - int *grid_indices, int totgrid, unsigned int **grid_hidden, int gridsize, const struct CCGKey *key, - struct GridCommonGPUBuffer **grid_common_gpu_buffer); + int *grid_indices, int totgrid, unsigned int **grid_hidden, int gridsize, const struct CCGKey *key); GPU_PBVH_Buffers *GPU_pbvh_bmesh_buffers_build(bool smooth_shading); @@ -98,7 +96,6 @@ bool GPU_pbvh_buffers_has_mask(GPU_PBVH_Buffers *buffers); void GPU_pbvh_BB_draw(float min[3], float max[3], bool leaf, unsigned int pos); void GPU_pbvh_buffers_free(GPU_PBVH_Buffers *buffers); -void GPU_pbvh_multires_buffers_free(struct GridCommonGPUBuffer **grid_common_gpu_buffer); void GPU_pbvh_fix_linking(void); diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index f970717c2c9..6da7deece32 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -58,16 +58,6 @@ #include "bmesh.h" -static ThreadMutex buffer_mutex = BLI_MUTEX_INITIALIZER; - -/* multires global buffer, can be used for many grids having the same grid size */ -typedef struct GridCommonGPUBuffer { - GPUIndexBuf *mres_buffer; - int mres_prev_gridsize; - int mres_prev_totgrid; - unsigned mres_prev_totquad; -} GridCommonGPUBuffer; - /* XXX: the rest of the code in this file is used for optimized PBVH * drawing and doesn't interact at all with the buffer code above */ @@ -484,46 +474,22 @@ void GPU_pbvh_grid_buffers_update( /* end FILL_QUAD_BUFFER */ static GPUIndexBuf *gpu_get_grid_buffer( - int gridsize, unsigned *totquad, GridCommonGPUBuffer **grid_common_gpu_buffer, + int gridsize, unsigned *totquad, /* remove this arg when GPU gets base-vertex support! */ int totgrid) { /* used in the FILL_QUAD_BUFFER macro */ BLI_bitmap * const *grid_hidden = NULL; const int *grid_indices = NULL; - // int totgrid = 1; - - GridCommonGPUBuffer *gridbuff = *grid_common_gpu_buffer; - - if (gridbuff == NULL) { - *grid_common_gpu_buffer = gridbuff = MEM_mallocN(sizeof(GridCommonGPUBuffer), __func__); - gridbuff->mres_buffer = NULL; - gridbuff->mres_prev_gridsize = -1; - gridbuff->mres_prev_totquad = 0; - gridbuff->mres_prev_totgrid = 0; - } - - /* VBO is already built */ - if (gridbuff->mres_buffer && gridbuff->mres_prev_gridsize == gridsize && gridbuff->mres_prev_totgrid == totgrid) { - *totquad = gridbuff->mres_prev_totquad; - return gridbuff->mres_buffer; - } - /* we can't reuse old, delete the existing buffer */ - else if (gridbuff->mres_buffer) { - GPU_indexbuf_discard(gridbuff->mres_buffer); - gridbuff->mres_buffer = NULL; - } /* Build new VBO */ *totquad = (gridsize - 1) * (gridsize - 1) * totgrid; int max_vert = gridsize * gridsize * totgrid; - FILL_QUAD_BUFFER(max_vert, *totquad, gridbuff->mres_buffer); + GPUIndexBuf *mres_buffer; + FILL_QUAD_BUFFER(max_vert, *totquad, mres_buffer); - gridbuff->mres_prev_gridsize = gridsize; - gridbuff->mres_prev_totquad = *totquad; - gridbuff->mres_prev_totgrid = totgrid; - return gridbuff->mres_buffer; + return mres_buffer; } #define FILL_FAST_BUFFER() \ @@ -542,8 +508,7 @@ static GPUIndexBuf *gpu_get_grid_buffer( } (void)0 GPU_PBVH_Buffers *GPU_pbvh_grid_buffers_build( - int *grid_indices, int totgrid, BLI_bitmap **grid_hidden, int gridsize, const CCGKey *UNUSED(key), - GridCommonGPUBuffer **grid_common_gpu_buffer) + int *grid_indices, int totgrid, BLI_bitmap **grid_hidden, int gridsize, const CCGKey *UNUSED(key)) { GPU_PBVH_Buffers *buffers; int totquad; @@ -566,10 +531,9 @@ GPU_PBVH_Buffers *GPU_pbvh_grid_buffers_build( FILL_FAST_BUFFER(); if (totquad == fully_visible_totquad) { - buffers->index_buf = gpu_get_grid_buffer( - gridsize, &buffers->tot_quad, grid_common_gpu_buffer, totgrid); + buffers->index_buf = gpu_get_grid_buffer(gridsize, &buffers->tot_quad, totgrid); buffers->has_hidden = false; - buffers->is_index_buf_global = true; + buffers->is_index_buf_global = false; } else { uint max_vert = totgrid * gridsize * gridsize; @@ -880,21 +844,6 @@ void GPU_pbvh_buffers_free(GPU_PBVH_Buffers *buffers) } } -void GPU_pbvh_multires_buffers_free(GridCommonGPUBuffer **grid_common_gpu_buffer) -{ - GridCommonGPUBuffer *gridbuff = *grid_common_gpu_buffer; - - if (gridbuff) { - if (gridbuff->mres_buffer) { - BLI_mutex_lock(&buffer_mutex); - GPU_INDEXBUF_DISCARD_SAFE(gridbuff->mres_buffer); - BLI_mutex_unlock(&buffer_mutex); - } - MEM_freeN(gridbuff); - *grid_common_gpu_buffer = NULL; - } -} - /* debug function, draws the pbvh BB */ void GPU_pbvh_BB_draw(float min[3], float max[3], bool leaf, unsigned int pos) { |