[Bf-blender-cvs] [4e759d6] master: Fixes T46060 Regenerated the full list of constants we should expose

Martijn Berger noreply at git.blender.org
Wed Sep 9 18:36:31 CEST 2015


Commit: 4e759d6735dc140f9ef389130aaaa1db73593296
Author: Martijn Berger
Date:   Wed Sep 9 18:35:05 2015 +0200
Branches: master
https://developer.blender.org/rB4e759d6735dc140f9ef389130aaaa1db73593296

Fixes T46060 Regenerated the full list of constants we should expose

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

M	source/blender/python/generic/bgl.c

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

diff --git a/source/blender/python/generic/bgl.c b/source/blender/python/generic/bgl.c
index 88f0fbf..0c5cc07 100644
--- a/source/blender/python/generic/bgl.c
+++ b/source/blender/python/generic/bgl.c
@@ -3024,15 +3024,57 @@ PyObject *BPyInit_bgl(void)
 
 	/* GL_VERSION_1_4 */
 	{
+		PY_DICT_ADD_INT(GL_BLEND_DST_ALPHA);
+		PY_DICT_ADD_INT(GL_BLEND_DST_RGB);
+		PY_DICT_ADD_INT(GL_BLEND_SRC_ALPHA);
+		PY_DICT_ADD_INT(GL_BLEND_SRC_RGB);
 		PY_DICT_ADD_INT(GL_CONSTANT_ALPHA);
 		PY_DICT_ADD_INT(GL_CONSTANT_COLOR);
+		PY_DICT_ADD_INT(GL_DECR_WRAP);
+		PY_DICT_ADD_INT(GL_DEPTH_COMPONENT16);
+		PY_DICT_ADD_INT(GL_DEPTH_COMPONENT24);
+		PY_DICT_ADD_INT(GL_DEPTH_COMPONENT32);
 		PY_DICT_ADD_INT(GL_FUNC_ADD);
 		PY_DICT_ADD_INT(GL_FUNC_REVERSE_SUBTRACT);
 		PY_DICT_ADD_INT(GL_FUNC_SUBTRACT);
+		PY_DICT_ADD_INT(GL_INCR_WRAP);
 		PY_DICT_ADD_INT(GL_MAX);
+		PY_DICT_ADD_INT(GL_MAX_TEXTURE_LOD_BIAS);
 		PY_DICT_ADD_INT(GL_MIN);
+		PY_DICT_ADD_INT(GL_MIRRORED_REPEAT);
 		PY_DICT_ADD_INT(GL_ONE_MINUS_CONSTANT_ALPHA);
 		PY_DICT_ADD_INT(GL_ONE_MINUS_CONSTANT_COLOR);
+		PY_DICT_ADD_INT(GL_POINT_FADE_THRESHOLD_SIZE);
+		PY_DICT_ADD_INT(GL_TEXTURE_COMPARE_FUNC);
+		PY_DICT_ADD_INT(GL_TEXTURE_COMPARE_MODE);
+		PY_DICT_ADD_INT(GL_TEXTURE_DEPTH_SIZE);
+		PY_DICT_ADD_INT(GL_TEXTURE_LOD_BIAS);
+	}
+	/* adding in GL_VERSION_1_4 removed from core profile */
+	if (use_deprecated == true) {
+		PY_DICT_ADD_INT(GL_COLOR_SUM);
+		PY_DICT_ADD_INT(GL_COMPARE_R_TO_TEXTURE);
+		PY_DICT_ADD_INT(GL_CURRENT_FOG_COORDINATE);
+		PY_DICT_ADD_INT(GL_CURRENT_SECONDARY_COLOR);
+		PY_DICT_ADD_INT(GL_DEPTH_TEXTURE_MODE);
+		PY_DICT_ADD_INT(GL_FOG_COORDINATE);
+		PY_DICT_ADD_INT(GL_FOG_COORDINATE_ARRAY);
+		PY_DICT_ADD_INT(GL_FOG_COORDINATE_ARRAY_POINTER);
+		PY_DICT_ADD_INT(GL_FOG_COORDINATE_ARRAY_STRIDE);
+		PY_DICT_ADD_INT(GL_FOG_COORDINATE_ARRAY_TYPE);
+		PY_DICT_ADD_INT(GL_FOG_COORDINATE_SOURCE);
+		PY_DICT_ADD_INT(GL_FRAGMENT_DEPTH);
+		PY_DICT_ADD_INT(GL_GENERATE_MIPMAP);
+		PY_DICT_ADD_INT(GL_GENERATE_MIPMAP_HINT);
+		PY_DICT_ADD_INT(GL_POINT_DISTANCE_ATTENUATION);
+		PY_DICT_ADD_INT(GL_POINT_SIZE_MAX);
+		PY_DICT_ADD_INT(GL_POINT_SIZE_MIN);
+		PY_DICT_ADD_INT(GL_SECONDARY_COLOR_ARRAY);
+		PY_DICT_ADD_INT(GL_SECONDARY_COLOR_ARRAY_POINTER);
+		PY_DICT_ADD_INT(GL_SECONDARY_COLOR_ARRAY_SIZE);
+		PY_DICT_ADD_INT(GL_SECONDARY_COLOR_ARRAY_STRIDE);
+		PY_DICT_ADD_INT(GL_SECONDARY_COLOR_ARRAY_TYPE);
+		PY_DICT_ADD_INT(GL_TEXTURE_FILTER_CONTROL);
 	}
 
 
@@ -3219,20 +3261,256 @@ PyObject *BPyInit_bgl(void)
 
 	/* GL_VERSION_3_0 */
 	{
+		PY_DICT_ADD_INT(GL_BGRA_INTEGER);
+		PY_DICT_ADD_INT(GL_BGR_INTEGER);
+		PY_DICT_ADD_INT(GL_BLUE_INTEGER);
+		PY_DICT_ADD_INT(GL_BUFFER_ACCESS_FLAGS);
+		PY_DICT_ADD_INT(GL_BUFFER_MAP_LENGTH);
+		PY_DICT_ADD_INT(GL_BUFFER_MAP_OFFSET);
+		PY_DICT_ADD_INT(GL_CLAMP_READ_COLOR);
+		PY_DICT_ADD_INT(GL_CLIP_DISTANCE0);
+		PY_DICT_ADD_INT(GL_CLIP_DISTANCE1);
+		PY_DICT_ADD_INT(GL_CLIP_DISTANCE2);
+		PY_DICT_ADD_INT(GL_CLIP_DISTANCE3);
+		PY_DICT_ADD_INT(GL_CLIP_DISTANCE4);
+		PY_DICT_ADD_INT(GL_CLIP_DISTANCE5);
+		PY_DICT_ADD_INT(GL_CLIP_DISTANCE6);
+		PY_DICT_ADD_INT(GL_CLIP_DISTANCE7);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT0);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT1);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT10);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT11);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT12);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT13);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT14);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT15);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT16);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT17);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT18);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT19);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT2);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT20);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT21);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT22);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT23);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT24);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT25);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT26);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT27);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT28);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT29);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT3);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT30);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT31);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT4);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT5);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT6);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT7);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT8);
+		PY_DICT_ADD_INT(GL_COLOR_ATTACHMENT9);
+		PY_DICT_ADD_INT(GL_COMPARE_REF_TO_TEXTURE);
+		PY_DICT_ADD_INT(GL_COMPRESSED_RED);
+		PY_DICT_ADD_INT(GL_COMPRESSED_RED_RGTC1);
+		PY_DICT_ADD_INT(GL_COMPRESSED_RG);
+		PY_DICT_ADD_INT(GL_COMPRESSED_RG_RGTC2);
+		PY_DICT_ADD_INT(GL_COMPRESSED_SIGNED_RED_RGTC1);
+		PY_DICT_ADD_INT(GL_COMPRESSED_SIGNED_RG_RGTC2);
+		PY_DICT_ADD_INT(GL_CONTEXT_FLAGS);
+		PY_DICT_ADD_INT(GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT);
+		PY_DICT_ADD_INT(GL_DEPTH24_STENCIL8);
+		PY_DICT_ADD_INT(GL_DEPTH32F_STENCIL8);
+		PY_DICT_ADD_INT(GL_DEPTH_ATTACHMENT);
+		PY_DICT_ADD_INT(GL_DEPTH_COMPONENT32F);
+		PY_DICT_ADD_INT(GL_DEPTH_STENCIL);
+		PY_DICT_ADD_INT(GL_DEPTH_STENCIL_ATTACHMENT);
+		PY_DICT_ADD_INT(GL_DRAW_FRAMEBUFFER);
+		PY_DICT_ADD_INT(GL_DRAW_FRAMEBUFFER_BINDING);
+		PY_DICT_ADD_INT(GL_FIXED_ONLY);
+		PY_DICT_ADD_INT(GL_FLOAT_32_UNSIGNED_INT_24_8_REV);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_BINDING);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_COMPLETE);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_DEFAULT);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_SRGB);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_UNDEFINED);
+		PY_DICT_ADD_INT(GL_FRAMEBUFFER_UNSUPPORTED);
+		PY_DICT_ADD_INT(GL_GREEN_INTEGER);
+		PY_DICT_ADD_INT(GL_HALF_FLOAT);
+		PY_DICT_ADD_INT(GL_INDEX);
+		PY_DICT_ADD_INT(GL_INTERLEAVED_ATTRIBS);
+		PY_DICT_ADD_INT(GL_INT_SAMPLER_1D);
+		PY_DICT_ADD_INT(GL_INT_SAMPLER_1D_ARRAY);
+		PY_DICT_ADD_INT(GL_INT_SAMPLER_2D);
+		PY_DICT_ADD_INT(GL_INT_SAMPLER_2D_ARRAY);
+		PY_DICT_ADD_INT(GL_INT_SAMPLER_3D);
+		PY_DICT_ADD_INT(GL_INT_SAMPLER_CUBE);
+		PY_DICT_ADD_INT(GL_INVALID_FRAMEBUFFER_OPERATION);
+		PY_DICT_ADD_INT(GL_MAJOR_VERSION);
+		PY_DICT_ADD_INT(GL_MAP_FLUSH_EXPLICIT_BIT);
+		PY_DICT_ADD_INT(GL_MAP_INVALIDATE_BUFFER_BIT);
+		PY_DICT_ADD_INT(GL_MAP_INVALIDATE_RANGE_BIT);
+		PY_DICT_ADD_INT(GL_MAP_READ_BIT);
+		PY_DICT_ADD_INT(GL_MAP_UNSYNCHRONIZED_BIT);
+		PY_DICT_ADD_INT(GL_MAP_WRITE_BIT);
+		PY_DICT_ADD_INT(GL_MAX_ARRAY_TEXTURE_LAYERS);
+		PY_DICT_ADD_INT(GL_MAX_CLIP_DISTANCES);
+		PY_DICT_ADD_INT(GL_MAX_COLOR_ATTACHMENTS);
+		PY_DICT_ADD_INT(GL_MAX_PROGRAM_TEXEL_OFFSET);
+		PY_DICT_ADD_INT(GL_MAX_RENDERBUFFER_SIZE);
+		PY_DICT_ADD_INT(GL_MAX_SAMPLES);
+		PY_DICT_ADD_INT(GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS);
+		PY_DICT_ADD_INT(GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS);
+		PY_DICT_ADD_INT(GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS);
+		PY_DICT_ADD_INT(GL_MAX_VARYING_COMPONENTS);
+		PY_DICT_ADD_INT(GL_MINOR_VERSION);
+		PY_DICT_ADD_INT(GL_MIN_PROGRAM_TEXEL_OFFSET);
+		PY_DICT_ADD_INT(GL_NUM_EXTENSIONS);
+		PY_DICT_ADD_INT(GL_PRIMITIVES_GENERATED);
+		PY_DICT_ADD_INT(GL_PROXY_TEXTURE_1D_ARRAY);
+		PY_DICT_ADD_INT(GL_PROXY_TEXTURE_2D_ARRAY);
+		PY_DICT_ADD_INT(GL_QUERY_BY_REGION_NO_WAIT);
+		PY_DICT_ADD_INT(GL_QUERY_BY_REGION_WAIT);
+		PY_DICT_ADD_INT(GL_QUERY_NO_WAIT);
+		PY_DICT_ADD_INT(GL_QUERY_WAIT);
+		PY_DICT_ADD_INT(GL_R11F_G11F_B10F);
+		PY_DICT_ADD_INT(GL_R16);
+		PY_DICT_ADD_INT(GL_R16F);
+		PY_DICT_ADD_INT(GL_R16I);
+		PY_DICT_ADD_INT(GL_R16UI);
+		PY_DICT_ADD_INT(GL_R32F);
+		PY_DICT_ADD_INT(GL_R32I);
+		PY_DICT_ADD_INT(GL_R32UI);
+		PY_DICT_ADD_INT(GL_R8);
+		PY_DICT_ADD_INT(GL_R8I);
+		PY_DICT_ADD_INT(GL_R8UI);
+		PY_DICT_ADD_INT(GL_RASTERIZER_DISCARD);
+		PY_DICT_ADD_INT(GL_READ_FRAMEBUFFER);
+		PY_DICT_ADD_INT(GL_READ_FRAMEBUFFER_BINDING);
+		PY_DICT_ADD_INT(GL_RED_INTEGER);
+		PY_DICT_ADD_INT(GL_RENDERBUFFER);
+		PY_DICT_ADD_INT(GL_RENDERBUFFER_ALPHA_SIZE);
+		PY_DICT_ADD_INT(GL_RENDERBUFFER_BINDING);
+		PY_DICT_ADD_INT(GL_RENDERBUFFER_BLUE_SIZE);
+		PY_DICT_ADD_INT(GL_RENDERBUFFER_DEPTH_SIZE);
+		PY_DICT_ADD_INT(GL_RENDERBUFFER_GREEN_SIZE);
+		PY_DICT_ADD_INT(GL_RENDERBUFFER_HEIGHT);
+		PY_DICT_ADD_INT(GL_RENDERBUFFER_INTERNAL_FORMAT);
+		PY_DICT_ADD_INT(GL_RENDERBUFFER_RED_SIZE);
+		PY_DICT_ADD_INT(GL_RENDERBUFFER_SAMPLES);
+		PY_DICT_ADD_INT(GL_RENDERBUFFER_STENCIL_SIZE);
+		PY_DICT_ADD_INT(GL_RENDERBUFFER_WIDTH);
+		PY_DICT_ADD_INT(GL_RG);
+		PY_DICT_ADD_INT(GL_RG16);
+		PY_DICT_ADD_INT(GL_RG16F);
+		PY_DICT_ADD_INT(GL_RG16I);
+		PY_DICT_ADD_INT(GL_RG16UI);
+		PY_DICT_ADD_INT(GL_RG32F);
+		PY_DICT_ADD_INT(GL_RG32I);
+		PY_DICT_ADD_INT(GL_RG32UI);
+		PY_DICT_ADD_INT(GL_RG8);
+		PY_DICT_ADD_INT(GL_RG8I);
+		PY_DICT_ADD_INT(GL_RG8UI);
+		PY_DICT_ADD_INT(GL_RGB16F);
+		PY_DICT_ADD_INT(GL_RGB16I);
+		PY_DICT_ADD_INT(GL_RGB16UI);
+		PY_DICT_ADD_INT(GL_RGB32F);
+		PY_DICT_ADD_INT(GL_RGB32I);
+		PY_DICT_ADD_INT(GL_RGB32UI);
+		PY_DICT_ADD_INT(GL_RGB8I);
+		PY_DICT_ADD_INT(GL_RGB8UI);
+		PY_DICT_ADD_INT(GL_RGB9_E5);
+		PY_DICT_ADD_INT(GL_RGBA16F);
+		PY_DICT_ADD_INT(GL_RGBA16I);
+		PY_DICT_ADD_INT(GL_RGBA16UI);
+		PY_DICT_ADD_INT(GL_RGBA32F);
+		PY_DICT_ADD_INT(GL_RGBA32I)

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list