Cleanup: gpu constants weren't so clearly arranged

Also reminder to update docs w/ the API.

1 files changed, 29 insertions, 6 deletions

diff --git a/source/blender/python/intern/gpu.c b/source/blender/python/intern/gpu.c
index f933c02390c..a7ece10f06c 100644
--- a/source/blender/python/intern/gpu.c
+++ b/source/blender/python/intern/gpu.c
@@ -79,6 +79,13 @@ static PyObject *PyInit_gpu(void)
 	if (m == NULL)
 		return NULL;
 
+
+	/* Take care to update docs when editing: 'doc/python_api/rst/gpu.rst' */
+
+
+	/* -------------------------------------------------------------------- */
+	/* GPUDynamicType */
+
 	/* device constant groups */
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_GROUP_MISC);
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_GROUP_LAMP);
@@ -90,12 +97,14 @@ static PyObject *PyInit_gpu(void)
 
 	/* device constants */
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_NONE);
+	/* GPU_DYNAMIC_GROUP_OBJECT */
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_OBJECT_VIEWMAT);
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_OBJECT_MAT);
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_OBJECT_VIEWIMAT);
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_OBJECT_IMAT);
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_OBJECT_COLOR);
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_OBJECT_AUTOBUMPSCALE);
+	/* GPU_DYNAMIC_GROUP_LAMP */
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_LAMP_DYNVEC);
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_LAMP_DYNCO);
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_LAMP_DYNIMAT);
@@ -105,27 +114,35 @@ static PyObject *PyInit_gpu(void)
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_LAMP_ATT1);
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_LAMP_ATT2);
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_LAMP_DISTANCE);
-	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_LAMP_SPOTBLEND);
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_LAMP_SPOTSIZE);
+	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_LAMP_SPOTBLEND);
+	/* GPU_DYNAMIC_GROUP_SAMPLER */
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_SAMPLER_2DBUFFER);
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_SAMPLER_2DIMAGE);
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_SAMPLER_2DSHADOW);
+	/* GPU_DYNAMIC_GROUP_MIST */
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_MIST_ENABLE);
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_MIST_START);
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_MIST_DISTANCE);
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_MIST_INTENSITY);
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_MIST_TYPE);
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_MIST_COLOR);
+	/* GPU_DYNAMIC_GROUP_WORLD */
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_HORIZON_COLOR);
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_AMBIENT_COLOR);
-	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_MAT_ALPHA);
-	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_MAT_AMB);
+	/* GPU_DYNAMIC_GROUP_MAT */
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_MAT_DIFFRGB);
-	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_MAT_EMIT);
-	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_MAT_HARD);
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_MAT_REF);
-	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_MAT_SPEC);
 	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_MAT_SPECRGB);
+	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_MAT_SPEC);
+	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_MAT_HARD);
+	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_MAT_EMIT);
+	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_MAT_AMB);
+	PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_MAT_ALPHA);
+
+
+	/* -------------------------------------------------------------------- */
+	/* GPUDataType */
 
 	PY_MODULE_ADD_CONSTANT(m, GPU_DATA_1I);
 	PY_MODULE_ADD_CONSTANT(m, GPU_DATA_1F);
@@ -136,6 +153,12 @@ static PyObject *PyInit_gpu(void)
 	PY_MODULE_ADD_CONSTANT(m, GPU_DATA_16F);
 	PY_MODULE_ADD_CONSTANT(m, GPU_DATA_4UB);
 
+
+	/* -------------------------------------------------------------------- */
+	/* CustomDataType
+	 *
+	 * Intentionally only include the subset used by the GPU API.
+	 */
 	PY_MODULE_ADD_CONSTANT(m, CD_MTFACE);
 	PY_MODULE_ADD_CONSTANT(m, CD_ORCO);
 	PY_MODULE_ADD_CONSTANT(m, CD_TANGENT);