[Bf-blender-cvs] [32a8f3551f6] greasepencil-object: Cleanup: More unused include files, reorganization and name changes

[Antonio Vazquez]

Commit: 32a8f3551f6148f45d5688bdfaf410bdf2fa3f53
Author: Antonio Vazquez
Date:   Sun May 21 17:29:58 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB32a8f3551f6148f45d5688bdfaf410bdf2fa3f53

Cleanup: More unused include files, reorganization and name changes

===================================================================

M	source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
M	source/blender/draw/engines/gpencil/gpencil_engine.c
M	source/blender/draw/engines/gpencil/gpencil_engine.h

===================================================================

diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
index 290f6773c45..6f0ac02de65 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -38,7 +38,6 @@
  /* If builtin shaders are needed */
 #include "GPU_shader.h"
 #include "GPU_texture.h"
-#include "GPU_glew.h"
 
 #include "IMB_imbuf_types.h"
 
@@ -461,7 +460,7 @@ static void gpencil_draw_strokes(GpencilBatchCache *cache, GPENCIL_e_data *e_dat
 		}
 
 		/* limit the number of shading groups */
-		if (stl->storage->pal_id >= MAX_GPENCIL_MAT) {
+		if (stl->storage->pal_id >= GPENCIL_MAX_SHGROUPS) {
 			continue;
 		}
 
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 18e5f9293d4..ae58e79ce23 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -119,8 +119,8 @@ static void GPENCIL_cache_init(void *vedata)
 		DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND | DRW_STATE_DEPTH_LESS;
 		psl->stroke_pass = DRW_pass_create("Gpencil Stroke Pass", state);
 		stl->storage->pal_id = 0;
-		memset(stl->storage->shgrps_fill, 0, sizeof(DRWShadingGroup *) * MAX_GPENCIL_MAT);
-		memset(stl->storage->shgrps_stroke, 0, sizeof(DRWShadingGroup *) * MAX_GPENCIL_MAT);
+		memset(stl->storage->shgrps_fill, 0, sizeof(DRWShadingGroup *) * GPENCIL_MAX_SHGROUPS);
+		memset(stl->storage->shgrps_stroke, 0, sizeof(DRWShadingGroup *) * GPENCIL_MAX_SHGROUPS);
 		stl->g_data->shgrps_point_volumetric = DRW_gpencil_shgroup_point_volumetric_create(psl->stroke_pass, e_data.gpencil_volumetric_sh);
 
 		state = DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND;
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h
index 96053b81a36..587161eee84 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@ -28,13 +28,12 @@
 
 #include "GPU_batch.h"
 
-#define MAX_GPENCIL_MAT 65536
+ /* TODO: these could be system parameter in userprefs screen */
+#define GPENCIL_CACHE_BLOCK_SIZE 8 
+#define GPENCIL_MAX_SHGROUPS 65536
 #define GPENCIL_MIN_BATCH_SLOTS_CHUNK 8
 
  /* *********** OBJECTS CACHE *********** */
- /* TODO: this could be a system parameter in userprefs screen */
-#define GPENCIL_CACHE_BLOCK_SIZE 8 
-
  /* used to sort gpencil objects */
 typedef struct tGPencilObjectCache {
 	Object *ob;
@@ -44,36 +43,32 @@ typedef struct tGPencilObjectCache {
  /* *********** LISTS *********** */
 typedef struct GPENCIL_Storage {
 	int pal_id; /* total elements */
-	int t_mix[MAX_GPENCIL_MAT];
-	int t_flip[MAX_GPENCIL_MAT];
-	int t_clamp[MAX_GPENCIL_MAT];
-	int fill_style[MAX_GPENCIL_MAT];
-	DRWShadingGroup *shgrps_fill[MAX_GPENCIL_MAT];
-	DRWShadingGroup *shgrps_stroke[MAX_GPENCIL_MAT];
+	int t_mix[GPENCIL_MAX_SHGROUPS];
+	int t_flip[GPENCIL_MAX_SHGROUPS];
+	int t_clamp[GPENCIL_MAX_SHGROUPS];
+	int fill_style[GPENCIL_MAX_SHGROUPS];
+	DRWShadingGroup *shgrps_fill[GPENCIL_MAX_SHGROUPS];
+	DRWShadingGroup *shgrps_stroke[GPENCIL_MAX_SHGROUPS];
 	float unit_matrix[4][4];
 	int is_persp;   /* rv3d->is_persp (1-yes) */
 	int xray;
 } GPENCIL_Storage;
 
-/* keep it under MAX_STORAGE */
 typedef struct GPENCIL_StorageList {
 	struct GPENCIL_Storage *storage;
 	struct g_data *g_data;
 } GPENCIL_StorageList;
 
-/* keep it under MAX_PASSES */
 typedef struct GPENCIL_PassList {
 	struct DRWPass *stroke_pass;
 	struct DRWPass *edit_pass;
 	struct DRWPass *drawing_pass;
 } GPENCIL_PassList;
 
-/* keep it under MAX_BUFFERS */
 typedef struct GPENCIL_FramebufferList {
 	struct GPUFrameBuffer *fb;
 } GPENCIL_FramebufferList;
 
-/* keep it under MAX_TEXTURES */
 typedef struct GPENCIL_TextureList {
 	struct GPUTexture *texture;
 } GPENCIL_TextureList;