[Bf-blender-cvs] [3e0abde] temp-python-bgl: batch-picky-edits (C style comments)
Campbell Barton
noreply at git.blender.org
Fri Jul 24 02:00:14 CEST 2015
Commit: 3e0abde6e0d2859368565e7c787f4c3a115254b5
Author: Campbell Barton
Date: Fri Jul 24 09:54:24 2015 +1000
Branches: temp-python-bgl
https://developer.blender.org/rB3e0abde6e0d2859368565e7c787f4c3a115254b5
batch-picky-edits (C style comments)
===================================================================
M source/blender/python/generic/bgl.c
===================================================================
diff --git a/source/blender/python/generic/bgl.c b/source/blender/python/generic/bgl.c
index ade7af7..5fdc813 100644
--- a/source/blender/python/generic/bgl.c
+++ b/source/blender/python/generic/bgl.c
@@ -1028,7 +1028,7 @@ static PyObject *Method_##funcname (PyObject *UNUSED(self), PyObject *args) \
ret_ret_##ret; \
}
-// GL_VERSION_1_0
+/* GL_VERSION_1_0 */
BGL_Wrap(Accum, void, (GLenum, GLfloat))
BGL_Wrap(AlphaFunc, void, (GLenum, GLfloat))
BGL_Wrap(Begin, void, (GLenum))
@@ -1337,7 +1337,7 @@ BGL_Wrap(Vertex4sv, void, (GLshortP))
BGL_Wrap(Viewport, void, (GLint, GLint, GLsizei, GLsizei))
-// GL_VERSION_1_1
+/* GL_VERSION_1_1 */
BGL_Wrap(AreTexturesResident, GLboolean, (GLsizei, GLuintP, GLbooleanP))
BGL_Wrap(ArrayElement, void, (GLint))
BGL_Wrap(BindTexture, void, (GLenum, GLuint))
@@ -1370,14 +1370,14 @@ BGL_Wrap(TexSubImage2D, void, (GLenum, GLint, GLint, GLint, GLs
BGL_Wrap(VertexPointer, void, (GLint, GLenum, GLsizei, GLvoidP))
-// GL_VERSION_1_2
+/* GL_VERSION_1_2 */
BGL_Wrap(CopyTexSubImage3D, void, (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei))
BGL_Wrap(DrawRangeElements, void, (GLenum, GLuint, GLuint, GLsizei, GLenum, GLvoidP))
BGL_Wrap(TexImage3D, void, (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, GLvoidP))
BGL_Wrap(TexSubImage3D, void, (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, GLvoidP))
-// GL_VERSION_1_3
+/* GL_VERSION_1_3 */
BGL_Wrap(ActiveTexture, void, (GLenum))
BGL_Wrap(ClientActiveTexture, void, (GLenum))
BGL_Wrap(CompressedTexImage1D, void, (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, GLvoidP))
@@ -1426,12 +1426,12 @@ BGL_Wrap(MultiTexCoord4sv, void, (GLenum, GLshortP))
BGL_Wrap(SampleCoverage, void, (GLfloat, GLboolean))
-// GL_VERSION_1_4
+/* GL_VERSION_1_4 */
BGL_Wrap(BlendColor, void, (GLfloat, GLfloat, GLfloat, GLfloat))
BGL_Wrap(BlendEquation, void, (GLenum))
-// GL_VERSION_1_5
+/* GL_VERSION_1_5 */
BGL_Wrap(BeginQuery, void, (GLenum, GLuint))
BGL_Wrap(BindBuffer, void, (GLenum, GLuint))
BGL_Wrap(BufferData, void, (GLenum, GLsizeiptr, GLvoidP, GLenum))
@@ -1453,7 +1453,7 @@ BGL_Wrap(MapBuffer, void, (GLenum, GLenum))
BGL_Wrap(UnmapBuffer, GLboolean, (GLenum))
-// GL_VERSION_2_0
+/* GL_VERSION_2_0 */
BGL_Wrap(AttachShader, void, (GLuint, GLuint))
BGL_Wrap(BindAttribLocation, void, (GLuint, GLuint, GLcharP))
BGL_Wrap(BlendEquationSeparate, void, (GLenum, GLenum))
@@ -1548,7 +1548,7 @@ BGL_Wrap(VertexAttrib4usv, void, (GLuint, GLushortP))
BGL_Wrap(VertexAttribPointer, void, (GLuint, GLint, GLenum, GLboolean, GLsizei, GLvoidP))
-// GL_VERSION_2_1
+/* GL_VERSION_2_1 */
BGL_Wrap(UniformMatrix2x3fv, void, (GLint, GLsizei, GLboolean, GLfloatP))
BGL_Wrap(UniformMatrix2x4fv, void, (GLint, GLsizei, GLboolean, GLfloatP))
BGL_Wrap(UniformMatrix3x2fv, void, (GLint, GLsizei, GLboolean, GLfloatP))
@@ -1557,14 +1557,14 @@ BGL_Wrap(UniformMatrix4x2fv, void, (GLint, GLsizei, GLboolean, GLflo
BGL_Wrap(UniformMatrix4x3fv, void, (GLint, GLsizei, GLboolean, GLfloatP))
-// GL_VERSION_3_0
+/* GL_VERSION_3_0 */
BGL_Wrap(BindVertexArray, void, (GLuint))
BGL_Wrap(DeleteVertexArrays, void, (GLsizei, GLuintP))
BGL_Wrap(GenVertexArrays, void, (GLsizei, GLuintP))
BGL_Wrap(IsVertexArray, GLboolean, (GLuint))
-// GL_VERSION_3_1
+/* GL_VERSION_3_1 */
BGL_Wrap(BindBufferBase, void, (GLenum, GLuint, GLuint))
BGL_Wrap(BindBufferRange, void, (GLenum, GLuint, GLuint, GLintptr, GLsizeiptr))
BGL_Wrap(GetActiveUniformBlockName, void, (GLuint, GLuint, GLsizei, GLsizeiP, GLcharP))
@@ -1577,7 +1577,7 @@ BGL_Wrap(GetUniformIndices, void, (GLuint, GLsizei, GLcharP, GLuint
BGL_Wrap(UniformBlockBinding, void, (GLuint, GLuint, GLuint))
-// GL_VERSION_3_2
+/* GL_VERSION_3_2 */
BGL_Wrap(FramebufferTexture, void, (GLenum, GLenum, GLuint, GLint))
BGL_Wrap(GetBufferParameteri64v, void, (GLenum, GLenum, GLint64P))
BGL_Wrap(GetInteger64i_v, void, (GLenum, GLuint, GLint64P))
@@ -1587,7 +1587,7 @@ BGL_Wrap(TexImage2DMultisample, void, (GLenum, GLsizei, GLenum, GLsizei
BGL_Wrap(TexImage3DMultisample, void, (GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei, GLboolean))
-// GL_VERSION_3_3
+/* GL_VERSION_3_3 */
BGL_Wrap(ColorP3ui, void, (GLenum, GLuint))
BGL_Wrap(ColorP3uiv, void, (GLenum, GLuintP))
BGL_Wrap(ColorP4ui, void, (GLenum, GLuint))
@@ -1712,7 +1712,7 @@ PyObject *BPyInit_bgl(void)
method_add_impl(submodule, dict, &method_def, (gl##func != NULL)); \
} ((void)0)
- // GL_VERSION_1_0
+ /* GL_VERSION_1_0 */
MethodAdd(BlendFunc);
MethodAdd(Clear);
MethodAdd(ClearColor);
@@ -1762,8 +1762,8 @@ PyObject *BPyInit_bgl(void)
MethodAdd(TexParameteriv);
MethodAdd(Viewport);
- // adding in GL_VERSION_1_0 removed from core profile
- if (BGL_add_deprecated == true ) {
+ /* adding in GL_VERSION_1_0 removed from core profile */
+ if (BGL_add_deprecated == true) {
MethodAdd(Accum);
MethodAdd(AlphaFunc);
MethodAdd(Begin);
@@ -2025,7 +2025,7 @@ PyObject *BPyInit_bgl(void)
}
- // GL_VERSION_1_1
+ /* GL_VERSION_1_1 */
MethodAdd(BindTexture);
MethodAdd(CopyTexImage1D);
MethodAdd(CopyTexImage2D);
@@ -2040,8 +2040,8 @@ PyObject *BPyInit_bgl(void)
MethodAdd(TexSubImage1D);
MethodAdd(TexSubImage2D);
- // adding in GL_VERSION_1_1 removed from core profile
- if (BGL_add_deprecated == true ) {
+ /* adding in GL_VERSION_1_1 removed from core profile */
+ if (BGL_add_deprecated == true) {
MethodAdd(AreTexturesResident);
MethodAdd(ArrayElement);
MethodAdd(ColorPointer);
@@ -2062,14 +2062,14 @@ PyObject *BPyInit_bgl(void)
}
- // GL_VERSION_1_2
+ /* GL_VERSION_1_2 */
MethodAdd(CopyTexSubImage3D);
MethodAdd(DrawRangeElements);
MethodAdd(TexImage3D);
MethodAdd(TexSubImage3D);
- // GL_VERSION_1_3
+ /* GL_VERSION_1_3 */
MethodAdd(ActiveTexture);
MethodAdd(CompressedTexImage1D);
MethodAdd(CompressedTexImage2D);
@@ -2080,8 +2080,8 @@ PyObject *BPyInit_bgl(void)
MethodAdd(GetCompressedTexImage);
MethodAdd(SampleCoverage);
- // adding in GL_VERSION_1_3 removed from core profile
- if (BGL_add_deprecated == true ) {
+ /* adding in GL_VERSION_1_3 removed from core profile */
+ if (BGL_add_deprecated == true) {
MethodAdd(ClientActiveTexture);
MethodAdd(LoadTransposeMatrixd);
MethodAdd(LoadTransposeMatrixf);
@@ -2122,12 +2122,12 @@ PyObject *BPyInit_bgl(void)
}
- // GL_VERSION_1_4
+ /* GL_VERSION_1_4 */
MethodAdd(BlendColor);
MethodAdd(BlendEquation);
- // GL_VERSION_1_5
+ /* GL_VERSION_1_5 */
MethodAdd(BeginQuery);
MethodAdd(BindBuffer);
MethodAdd(BufferData);
@@ -2149,7 +2149,7 @@ PyObject *BPyInit_bgl(void)
MethodAdd(UnmapBuffer);
- // GL_VERSION_2_0
+ /* GL_VERSION_2_0 */
MethodAdd(AttachShader);
MethodAdd(BindAttribLocation);
MethodAdd(BlendEquationSeparate);
@@ -2245,7 +2245,7 @@ PyObject *BPyInit_bgl(void)
MethodAdd(VertexAttribPointer);
- // GL_VERSION_2_1
+ /* GL_VERSION_2_1 */
MethodAdd(UniformMatrix2x3fv);
MethodAdd(UniformMatrix2x4fv);
MethodAdd(UniformMatrix3x2fv);
@@ -2254,14 +2254,14 @@ PyObject *BPyInit_bgl(void)
MethodAdd(UniformMatrix4x3fv);
- // GL_VERSION_3_0
+ /* GL_VERSION_3_0 */
MethodAdd(BindVertexArray);
MethodAdd(DeleteVertexArrays);
MethodAdd(GenVertexArrays);
MethodAdd(IsVertexArray);
- // GL_VERSION_3_1
+ /* GL_VERSION_3_1 */
MethodAdd(BindBufferBase);
MethodAdd(BindBufferRange);
MethodAdd(GetActiveUniformBlockName);
@@ -2274,7 +2274,7 @@ PyObject *BPyInit_bgl(void)
MethodAdd(UniformBlockBinding);
- // GL_VERSION_3_2
+ /* GL_VERSION_3_2 */
MethodAdd(FramebufferTexture);
MethodAdd(GetBufferParameteri64v);
MethodAdd(GetInteger64i_v);
@@ -2284,7 +2284,7 @@ PyObject *BPyInit_bgl(void)
MethodAdd(TexImage3DMultisample);
- // GL_VERSION_3_3
+ /* GL_VERSION_3_3 */
MethodAdd(ColorP3ui);
MethodAdd(ColorP3uiv);
MethodAdd(ColorP4ui);
@@ -2319,7 +2319,7 @@ PyObject *BPyInit_bgl(void)
#define EXPP_ADDCONST(x) expp_addconst_int(dict, #x, x)
- // GL_VERSION_1_1
+ /* GL_VERSION_1_1 */
EXPP_ADDCONST(GL_ALPHA);
EXPP_ADDCONST(GL_ALWAYS);
EXPP_ADDCONST(GL_AND);
@@ -2521,8 +2521,8 @@ PyObject *BPyInit_bgl(void)
EXPP_ADDCONST(GL_XOR);
EXPP_ADDCONST(GL_ZERO);
- // adding in GL_VERSION_1_1 removed from core profile
- if (BGL_add_deprecated == true ) {
+ /* adding in GL_VERSION_1_1 removed from core profile */
+ if (BGL_add_deprecated == true) {
EXPP_ADDCONST(GL_2D);
EXPP_ADDCONST(GL_2_BYTES);
EXPP_ADDCONST(GL_3D);
@@ -2854,7 +2854,7 @@ PyObject *BPyInit_bgl(void)
}
- // GL_VERSION_1_2
+ /* GL_VERSION_1_2 */
EXPP_ADDCONST(GL_ALIASED_LINE_WIDTH_RANGE);
EXPP_ADDCONST(GL_BGR);
EXPP_ADDCONST(GL_BGRA);
@@ -2892,8 +2892,8 @@ PyObject *BPyInit_bgl(void)
EXPP_ADDCONST(GL_UNSIGNED_SHORT_5_6_5);
EXPP_ADDCONST(GL_UNSIGNED_SHORT_5_6_5_REV);
- // adding in GL_VERSION_1_2 removed from core profile
- if (BGL_add_deprecated == true ) {
+ /* adding in GL_VERSION_1_2 removed from core profile */
+ if (BGL_add_deprecated == true) {
EXPP_ADDCONST(GL_ALIASED_POINT_SIZE_RANGE);
EXPP_ADDCONST(GL_LIGHT_MODEL_COLOR_CONTROL);
EXPP_ADDCONST(GL_RESCALE_NORMAL);
@@ -2902,7 +2902,7 @@ PyObject *BPyInit_bgl(void)
}
- // GL_VERSION_1_3
+ /* GL_VERSION_1_3 */
EXPP_ADDCONST(GL_ACTIVE_TEXTURE);
EXPP_ADDCONST(GL_CLAMP_TO_BORDER);
EXPP_ADDCONST(GL_COMPRESSED_RGB);
@@ -29
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list