From eaf993ad9472dcd22e005c4a1d4df8920a98aed4 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 11 Sep 2018 15:32:02 +0200 Subject: Followup for previous PBVH commit Didn't realize the index buffer is stored once in a BVH and same pointer is reused. Surprisingly, simple files were fixed with the previous fix. Now disabled the optimization all together, and it was simpler to just completely remove all residue of the code. It is likely to be a different implementation anyway, so no need to try to keep code in a semi-broken state. --- source/blender/gpu/GPU_buffers.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'source/blender/gpu/GPU_buffers.h') 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); -- cgit v1.2.3