1 files changed, 10 insertions, 184 deletions

diff --git a/source/blender/gpu/GPU_buffers.h b/source/blender/gpu/GPU_buffers.h
index 8fd34348f03..f496c92f283 100644
--- a/source/blender/gpu/GPU_buffers.h
+++ b/source/blender/gpu/GPU_buffers.h
@@ -32,191 +32,19 @@
 #ifndef __GPU_BUFFERS_H__
 #define __GPU_BUFFERS_H__
 
-#ifdef DEBUG
-/*  #define DEBUG_VBO(X) printf(X)*/
-#  define DEBUG_VBO(X)
-#else
-#  define DEBUG_VBO(X)
-#endif
-
 #include <stddef.h>
 
 struct BMesh;
 struct CCGElem;
 struct CCGKey;
 struct DMFlagMat;
-struct DerivedMesh;
-struct GSet;
-struct GPUVertPointLink;
-struct GPUDrawObject;
 struct GridCommonGPUBuffer;
-struct PBVH;
+struct GSet;
+struct MLoop;
+struct MLoopTri;
+struct MPoly;
 struct MVert;
-
-typedef struct GPUBuffer {
-	size_t size;        /* in bytes */
-	unsigned int id; /* used with vertex buffer objects */
-} GPUBuffer;
-
-typedef struct GPUBufferMaterial {
-	/* range of points used for this material */
-	unsigned int start;
-	unsigned int totelements;
-	unsigned int totloops;
-	unsigned int *polys; /* array of polygons for this material */
-	unsigned int totpolys; /* total polygons in polys */
-	unsigned int totvisiblepolys; /* total visible polygons */
-
-	/* original material index */
-	short mat_nr;
-} GPUBufferMaterial;
-
-void GPU_buffer_material_finalize(struct GPUDrawObject *gdo, GPUBufferMaterial *matinfo, int totmat);
-
-/* meshes are split up by material since changing materials requires
- * GL state changes that can't occur in the middle of drawing an
- * array.
- *
- * some simplifying assumptions are made:
- * - all quads are treated as two triangles.
- * - no vertex sharing is used; each triangle gets its own copy of the
- *   vertices it uses (this makes it easy to deal with a vertex used
- *   by faces with different properties, such as smooth/solid shading,
- *   different MCols, etc.)
- *
- * to avoid confusion between the original MVert vertices and the
- * arrays of OpenGL vertices, the latter are referred to here and in
- * the source as `points'. similarly, the OpenGL triangles generated
- * for MFaces are referred to as triangles rather than faces.
- */
-typedef struct GPUDrawObject {
-	GPUBuffer *points;
-	GPUBuffer *normals;
-	GPUBuffer *uv;
-	GPUBuffer *uv_tex;
-	GPUBuffer *colors;
-	GPUBuffer *edges;
-	GPUBuffer *uvedges;
-	GPUBuffer *triangles; /* triangle index buffer */
-
-	/* for each original vertex, the list of related points */
-	struct GPUVertPointLink *vert_points;
-
-	/* see: USE_GPU_POINT_LINK define */
-#if 0
-	/* storage for the vert_points lists */
-	struct GPUVertPointLink *vert_points_mem;
-	int vert_points_usage;
-#endif
-
-	int colType;
-
-	GPUBufferMaterial *materials;
-	int totmaterial;
-
-	unsigned int tot_triangle_point;
-	unsigned int tot_loose_point;
-	/* different than total loops since ngons get tesselated still */
-	unsigned int tot_loop_verts;
-
-	/* caches of the original DerivedMesh values */
-	unsigned int totvert;
-	unsigned int totedge;
-
-	unsigned int loose_edge_offset;
-	unsigned int tot_loose_edge_drawn;
-	unsigned int tot_edge_drawn;
-
-	/* for subsurf, offset where drawing of interior edges starts */
-	unsigned int interior_offset;
-	unsigned int totinterior;
-} GPUDrawObject;
-
-/* currently unused */
-// #define USE_GPU_POINT_LINK
-
-typedef struct GPUVertPointLink {
-#ifdef USE_GPU_POINT_LINK
-	struct GPUVertPointLink *next;
-#endif
-	/* -1 means uninitialized */
-	int point_index;
-} GPUVertPointLink;
-
-
-
-/* used for GLSL materials */
-typedef struct GPUAttrib {
-	int index;
-	int info_index;
-	int size;
-	int type;
-} GPUAttrib;
-
-void GPU_global_buffer_pool_free(void);
-void GPU_global_buffer_pool_free_unused(void);
-
-GPUBuffer *GPU_buffer_alloc(size_t size);
-void GPU_buffer_free(GPUBuffer *buffer);
-
-void GPU_drawobject_free(struct DerivedMesh *dm);
-
-/* flag that controls data type to fill buffer with, a modifier will prepare. */
-typedef enum {
-	GPU_BUFFER_VERTEX = 0,
-	GPU_BUFFER_NORMAL,
-	GPU_BUFFER_COLOR,
-	GPU_BUFFER_UV,
-	GPU_BUFFER_UV_TEXPAINT,
-	GPU_BUFFER_EDGE,
-	GPU_BUFFER_UVEDGE,
-	GPU_BUFFER_TRIANGLES
-} GPUBufferType;
-
-typedef enum {
-	GPU_BINDING_ARRAY = 0,
-	GPU_BINDING_INDEX = 1,
-} GPUBindingType;
-
-typedef enum {
-	GPU_ATTR_INFO_SRGB = (1 << 0),
-} GPUAttrInfo;
-
-/* called before drawing */
-void GPU_vertex_setup(struct DerivedMesh *dm);
-void GPU_normal_setup(struct DerivedMesh *dm);
-void GPU_uv_setup(struct DerivedMesh *dm);
-void GPU_texpaint_uv_setup(struct DerivedMesh *dm);
-/* colType is the cddata MCol type to use! */
-void GPU_color_setup(struct DerivedMesh *dm, int colType);
-void GPU_buffer_bind_as_color(GPUBuffer *buffer);
-void GPU_edge_setup(struct DerivedMesh *dm); /* does not mix with other data */
-void GPU_uvedge_setup(struct DerivedMesh *dm);
-
-void GPU_triangle_setup(struct DerivedMesh *dm);
-
-int GPU_attrib_element_size(GPUAttrib data[], int numdata);
-void GPU_interleaved_attrib_setup(GPUBuffer *buffer, GPUAttrib data[], int numdata, int element_size);
-
-void GPU_buffer_bind(GPUBuffer *buffer, GPUBindingType binding);
-void GPU_buffer_unbind(GPUBuffer *buffer, GPUBindingType binding);
-
-/* can't lock more than one buffer at once */
-void *GPU_buffer_lock(GPUBuffer *buffer, GPUBindingType binding);
-void *GPU_buffer_lock_stream(GPUBuffer *buffer, GPUBindingType binding);
-void GPU_buffer_unlock(GPUBuffer *buffer, GPUBindingType binding);
-
-/* switch color rendering on=1/off=0 */
-void GPU_color_switch(int mode);
-
-/* used for drawing edges */
-void GPU_buffer_draw_elements(GPUBuffer *elements, unsigned int mode, int start, int count);
-
-/* called after drawing */
-void GPU_buffers_unbind(void);
-
-/* only unbind interleaved data */
-void GPU_interleaved_attrib_unbind(void);
+struct PBVH;
 
 /* Buffers for non-DerivedMesh drawing */
 typedef struct GPU_PBVH_Buffers GPU_PBVH_Buffers;
@@ -263,14 +91,10 @@ void GPU_pbvh_grid_buffers_update(
         const int update_flags);
 
 /* draw */
-void GPU_pbvh_buffers_draw(
-        GPU_PBVH_Buffers *buffers, DMSetMaterial setMaterial,
-        bool wireframe, bool fast);
+struct Gwn_Batch *GPU_pbvh_buffers_batch_get(GPU_PBVH_Buffers *buffers, bool fast);
 
-/* debug PBVH draw*/
-void GPU_pbvh_BB_draw(float min[3], float max[3], bool leaf);
-void GPU_pbvh_BB_draw_init(void);
-void GPU_pbvh_BB_draw_end(void);
+/* debug PBVH draw */
+void GPU_pbvh_BB_draw(float min[3], float max[3], bool leaf, unsigned int pos);
 
 bool GPU_pbvh_buffers_diffuse_changed(GPU_PBVH_Buffers *buffers, struct GSet *bm_faces, bool show_diffuse_color);
 bool GPU_pbvh_buffers_mask_changed(GPU_PBVH_Buffers *buffers, bool show_mask);
@@ -278,4 +102,6 @@ bool GPU_pbvh_buffers_mask_changed(GPU_PBVH_Buffers *buffers, bool show_mask);
 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);
+
 #endif