From c402a379a23af71aa5c21566967b75ab5c869e01 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Sun, 22 Nov 2015 19:46:31 +0100 Subject: Remove vertex array support from GPUBuffers. Remove USER_DISABLE_VBO. All GPUBuffer rendering is now done using vertex buffers. Vertex arrays are completely removed from GL 3.2 core profile, so we'll have to do this change at some point anyway. This commit, though big, is not modifying blender in any way. Use should be exactly as if the vetex buffer option is constantly on. --- source/blender/gpu/GPU_buffers.h | 4 +--- 1 file changed, 1 insertion(+), 3 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 e653af0c7ec..9c67f404a12 100644 --- a/source/blender/gpu/GPU_buffers.h +++ b/source/blender/gpu/GPU_buffers.h @@ -54,9 +54,7 @@ struct MVert; typedef struct GPUBuffer { size_t size; /* in bytes */ - void *pointer; /* used with vertex arrays */ unsigned int id; /* used with vertex buffer objects */ - bool use_vbo; /* true for VBOs, false for vertex arrays */ } GPUBuffer; typedef struct GPUBufferMaterial { @@ -156,7 +154,7 @@ typedef struct GPUAttrib { void GPU_global_buffer_pool_free(void); void GPU_global_buffer_pool_free_unused(void); -GPUBuffer *GPU_buffer_alloc(size_t size, bool force_vertex_arrays); +GPUBuffer *GPU_buffer_alloc(size_t size); void GPU_buffer_free(GPUBuffer *buffer); void GPU_drawobject_free(struct DerivedMesh *dm); -- cgit v1.2.3