DRW: Refactor: Use DRWCall to accumulate per instance attributes

This is a big change that cleanup a lot of confusing code.
- The instancing/batching data buffer distribution in draw_instance_data.c.
- The selection & drawing code in draw_manager_exec.c
- Prety much every non-meshes object drawing (object_mode.c).

Most of the changes are just renaming but there still a chance a typo might
have sneek through.

The Batching/Instancing Shading groups are replace by DRWCallBuffers. This
is cleaner and conceptually more in line with what a DRWShadingGroup should
be.

There is still some little confusion in draw_common.c where some function
takes shgroup as input and some don't.

1 files changed, 11 insertions, 12 deletions

diff --git a/source/blender/draw/intern/draw_instance_data.h b/source/blender/draw/intern/draw_instance_data.h
index ea5c6ac7bb2..d88de1a58e2 100644
--- a/source/blender/draw/intern/draw_instance_data.h
+++ b/source/blender/draw/intern/draw_instance_data.h
@@ -30,6 +30,8 @@
 
 #define MAX_INSTANCE_DATA_SIZE 64 /* Can be adjusted for more */
 
+#define DRW_BUFFER_VERTS_CHUNK 128
+
 typedef struct DRWInstanceData DRWInstanceData;
 typedef struct DRWInstanceDataList DRWInstanceDataList;
 
@@ -38,18 +40,15 @@ struct DRWShadingGroup;
 void *DRW_instance_data_next(DRWInstanceData *idata);
 DRWInstanceData *DRW_instance_data_request(DRWInstanceDataList *idatalist, uint attr_size);
 
-void DRW_batching_buffer_request(DRWInstanceDataList *idatalist,
-                                 GPUVertFormat *format,
-                                 GPUPrimType type,
-                                 struct DRWShadingGroup *shgroup,
-                                 GPUBatch **r_batch,
-                                 GPUVertBuf **r_vert);
-void DRW_instancing_buffer_request(DRWInstanceDataList *idatalist,
-                                   GPUVertFormat *format,
-                                   GPUBatch *instance,
-                                   struct DRWShadingGroup *shgroup,
-                                   GPUBatch **r_batch,
-                                   GPUVertBuf **r_vert);
+GPUVertBuf *DRW_temp_buffer_request(DRWInstanceDataList *idatalist,
+                                    GPUVertFormat *format,
+                                    uint *vert_len);
+GPUBatch *DRW_temp_batch_instance_request(DRWInstanceDataList *idatalist,
+                                          GPUVertBuf *buf,
+                                          GPUBatch *geom);
+GPUBatch *DRW_temp_batch_request(DRWInstanceDataList *idatalist,
+                                 GPUVertBuf *buf,
+                                 GPUPrimType type);
 
 /* Upload all instance data to the GPU as soon as possible. */
 void DRW_instance_buffer_finish(DRWInstanceDataList *idatalist);