PyOpenGL 3.1.9a2__tar.gz → 3.1.10__tar.gz

{pyopengl-3.1.9a2 → pyopengl-3.1.10}/OpenGL/GL/AMD/vertex_shader_tessellator.py

@@ -24,14 +24,14 @@ Overview (from the spec)
 	                                  // of the vertex
 	
 	i o
-	  |\
-	  | \
+	  |\\
+	  | \\
 	  *--*
-	  |\ |\
-	  | \| \
+	  |\\ |\\
+	  | \\| \\
 	  *--*--*
-	  |\ |\ |\
-	  | \| \| \
+	  |\\ |\\ |\\
+	  | \\| \\| \\
 	j o--*--*--o k
 	
 	Figure 1  A Tessellated Triangle
@@ -43,14 +43,14 @@ Overview (from the spec)
 	    vec2 gl_UVCoord;            // UV coordinates of the vertex
 	
 	i o--*--*--o k
-	  |\ |\ |\ | 
-	  | \| \| \|
+	  |\\ |\\ |\\ | 
+	  | \\| \\| \\|
 	  *--*--*--*
-	  |\ |\ |\ | 
-	  | \| \| \|
+	  |\\ |\\ |\\ | 
+	  | \\| \\| \\|
 	  *--*--*--*
-	  |\ |\ |\ | 
-	  | \| \| \|
+	  |\\ |\\ |\\ | 
+	  | \\| \\| \\|
 	j o--*--*--o l
 	
 	Figure 2  A Tessellated Quad
@@ -69,6 +69,7 @@ Overview (from the spec)
 The official definition of this extension is available here:
 http://www.opengl.org/registry/specs/AMD/vertex_shader_tessellator.txt
 '''
+
 from OpenGL import platform, constant, arrays
 from OpenGL import extensions, wrapper
 import ctypes
@@ -76,10 +77,12 @@ from OpenGL.raw.GL import _types, _glgets
 from OpenGL.raw.GL.AMD.vertex_shader_tessellator import *
 from OpenGL.raw.GL.AMD.vertex_shader_tessellator import _EXTENSION_NAME
 
+
 def glInitVertexShaderTessellatorAMD():
     '''Return boolean indicating whether this extension is available'''
     from OpenGL import extensions
-    return extensions.hasGLExtension( _EXTENSION_NAME )
+
+    return extensions.hasGLExtension(_EXTENSION_NAME)
 
 
-### END AUTOGENERATED SECTION
+### END AUTOGENERATED SECTION

{pyopengl-3.1.9a2 → pyopengl-3.1.10}/OpenGL/GL/ARB/shader_objects.py

@@ -143,69 +143,88 @@ from OpenGL._bytes import bytes, _NULL_8_BYTE, as_8_bit
 from OpenGL.raw.GL import _errors
 from OpenGL.lazywrapper import lazy as _lazy
 from OpenGL import converters, error
-GL_INFO_LOG_LENGTH_ARB = constant.Constant( 'GL_INFO_LOG_LENGTH_ARB', 0x8B84 )
+
+GL_INFO_LOG_LENGTH_ARB = constant.Constant('GL_INFO_LOG_LENGTH_ARB', 0x8B84)
 
 glShaderSourceARB = platform.createExtensionFunction(
-    'glShaderSourceARB', dll=platform.PLATFORM.GL,
+    'glShaderSourceARB',
+    dll=platform.PLATFORM.GL,
     resultType=None,
-    argTypes=(_types.GLhandleARB, _types.GLsizei, ctypes.POINTER(ctypes.c_char_p), arrays.GLintArray,),
-    doc = 'glShaderSourceARB( GLhandleARB(shaderObj), [bytes(string),...] ) -> None',
-    argNames = ('shaderObj', 'count', 'string', 'length',),
-    extension = _EXTENSION_NAME,
+    argTypes=(
+        _types.GLhandleARB,
+        _types.GLsizei,
+        ctypes.POINTER(ctypes.c_char_p),
+        arrays.GLintArray,
+    ),
+    doc='glShaderSourceARB( GLhandleARB(shaderObj), [bytes(string),...] ) -> None',
+    argNames=(
+        'shaderObj',
+        'count',
+        'string',
+        'length',
+    ),
+    extension=_EXTENSION_NAME,
 )
-conv = converters.StringLengths( name='string' )
-glShaderSourceARB = wrapper.wrapper(
-    glShaderSourceARB
-).setPyConverter(
-    'count' # number of strings
-).setPyConverter(
-    'length' # lengths of strings
-).setPyConverter(
-    'string', conv.stringArray
-).setCResolver(
-    'string', conv.stringArrayForC,
-).setCConverter(
-    'length', conv,
-).setCConverter(
-    'count', conv.totalCount,
+conv = converters.StringLengths(name='string')
+glShaderSourceARB = (
+    wrapper.wrapper(glShaderSourceARB)
+    .setPyConverter(
+        'count'  # number of strings
+    )
+    .setPyConverter(
+        'length'  # lengths of strings
+    )
+    .setPyConverter('string', conv.stringArray)
+    .setCResolver(
+        'string',
+        conv.stringArrayForC,
+    )
+    .setCConverter(
+        'length',
+        conv,
+    )
+    .setCConverter(
+        'count',
+        conv.totalCount,
+    )
 )
 try:
     del conv
 except NameError as err:
     pass
 
-def _afterCheck( key ):
+
+def _afterCheck(key):
     """Generate an error-checking function for compilation operations"""
-    def GLSLCheckError(
-        result,
-        baseOperation=None,
-        cArguments=None,
-        *args
-    ):
-        result = _errors._error_checker.glCheckError( result, baseOperation, cArguments, *args )
-        status = glGetObjectParameterivARB(
-            cArguments[0], key
+
+    def GLSLCheckError(result, baseOperation=None, cArguments=None, *args):
+        result = _errors._error_checker.glCheckError(
+            result, baseOperation, cArguments, *args
         )
+        status = glGetObjectParameterivARB(cArguments[0], key)
         if not status:
             raise error.GLError(
-                result = result,
-                baseOperation = baseOperation,
-                cArguments = cArguments,
-                description= glGetInfoLogARB( cArguments[0] )
+                result=result,
+                baseOperation=baseOperation,
+                cArguments=cArguments,
+                description=glGetInfoLogARB(cArguments[0]),
             )
         return result
+
     return GLSLCheckError
 
+
 if OpenGL.ERROR_CHECKING:
-    glCompileShaderARB.errcheck = _afterCheck( GL_OBJECT_COMPILE_STATUS_ARB )
+    glCompileShaderARB.errcheck = _afterCheck(GL_OBJECT_COMPILE_STATUS_ARB)
 if OpenGL.ERROR_CHECKING:
-    glLinkProgramARB.errcheck = _afterCheck( GL_OBJECT_LINK_STATUS_ARB )
+    glLinkProgramARB.errcheck = _afterCheck(GL_OBJECT_LINK_STATUS_ARB)
 ## Not sure why, but these give invalid operation :(
 ##if glValidateProgramARB and OpenGL.ERROR_CHECKING:
 ##	glValidateProgramARB.errcheck = _afterCheck( GL_OBJECT_VALIDATE_STATUS_ARB )
 
-@_lazy( glGetInfoLogARB )
-def glGetInfoLogARB( baseOperation, obj ):
+
+@_lazy(glGetInfoLogARB)
+def glGetInfoLogARB(baseOperation, obj):
     """Retrieve the program/shader's error messages as a Python string
 
     returns string which is '' if no message
@@ -214,21 +233,23 @@ def glGetInfoLogARB( baseOperation, obj ):
     if length > 0:
         log = ctypes.create_string_buffer(length)
         baseOperation(obj, length, None, log)
-        return log.value.strip(_NULL_8_BYTE) # null-termination
+        return log.value.strip(_NULL_8_BYTE)  # null-termination
     return ''
 
-@_lazy( glGetAttachedObjectsARB )
-def glGetAttachedObjectsARB( baseOperation, obj ):
+
+@_lazy(glGetAttachedObjectsARB)
+def glGetAttachedObjectsARB(baseOperation, obj):
     """Retrieve the attached objects as an array of GLhandleARB instances"""
-    length= glGetObjectParameterivARB( obj, GL_OBJECT_ATTACHED_OBJECTS_ARB )
+    length = glGetObjectParameterivARB(obj, GL_OBJECT_ATTACHED_OBJECTS_ARB)
     if length > 0:
-        storage = arrays.GLuintArray.zeros( (length,))
-        baseOperation( obj, length, None, storage )
+        storage = arrays.GLuintArray.zeros((length,))
+        baseOperation(obj, length, None, storage)
         return storage
-    return arrays.GLuintArray.zeros( (0,))
+    return arrays.GLuintArray.zeros((0,))
+
 
-@_lazy( glGetShaderSourceARB )
-def glGetShaderSourceARB( baseOperation, obj ):
+@_lazy(glGetShaderSourceARB)
+def glGetShaderSourceARB(baseOperation, obj):
     """Retrieve the program/shader's source code as a Python string
 
     returns string which is '' if no source code
@@ -237,30 +258,42 @@ def glGetShaderSourceARB( baseOperation, obj ):
     if length > 0:
         source = ctypes.create_string_buffer(length)
         baseOperation(obj, length, None, source)
-        return source.value.strip(_NULL_8_BYTE) # null-termination
+        return source.value.strip(_NULL_8_BYTE)  # null-termination
     return ''
 
-@_lazy( glGetActiveUniformARB )
-def glGetActiveUniformARB(baseOperation,program, index,bufSize=None):
+
+@_lazy(glGetActiveUniformARB)
+def glGetActiveUniformARB(baseOperation, program, index, bufSize=None):
     """Retrieve the name, size and type of the uniform of the index in the program"""
-    max_index = int(glGetObjectParameterivARB( program, GL_OBJECT_ACTIVE_UNIFORMS_ARB ))
+    max_index = int(glGetObjectParameterivARB(program, GL_OBJECT_ACTIVE_UNIFORMS_ARB))
     if bufSize is None:
-        bufSize = int(glGetObjectParameterivARB( program, GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB))
+        bufSize = int(
+            glGetObjectParameterivARB(program, GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB)
+        )
     if index < max_index and index >= 0:
-        length,name,size,type = baseOperation( program, index, bufSize )
-        if hasattr(name,'tostring'):
+        length, name, size, type = baseOperation(program, index, bufSize)
+        if hasattr(name, 'tobytes'):
+            name = name.tobytes().rstrip(b'\000')
+        elif hasattr(name, 'tostring'):
             name = name.tostring().rstrip(b'\000')
-        elif hasattr(name,'value'):
+        elif hasattr(name, 'value'):
             name = name.value
-        return name,size,type
-    raise IndexError( 'Index %s out of range 0 to %i' % (index, max_index - 1, ) )
+        return name, size, type
+    raise IndexError(
+        'Index %s out of range 0 to %i'
+        % (
+            index,
+            max_index - 1,
+        )
+    )
+
 
-@_lazy( glGetUniformLocationARB )
-def glGetUniformLocationARB( baseOperation, program, name ):
+@_lazy(glGetUniformLocationARB)
+def glGetUniformLocationARB(baseOperation, program, name):
     """Check that name is a string with a null byte at the end of it"""
     if not name:
-        raise ValueError( """Non-null name required""" )
-    name = as_8_bit( name )
+        raise ValueError("""Non-null name required""")
+    name = as_8_bit(name)
     if name[-1] != _NULL_8_BYTE:
         name = name + _NULL_8_BYTE
-    return baseOperation( program, name )
+    return baseOperation(program, name)

{pyopengl-3.1.9a2 → pyopengl-3.1.10}/OpenGL/GL/ARB/shading_language_420pack.py

@@ -9,7 +9,7 @@ Overview (from the spec)
 	This is a language feature only extension formed from changes made
 	to version 4.20 of GLSL.  It includes:
 	
-	* Add line-continuation using '\', as in C++.
+	* Add line-continuation using '\\', as in C++.
 	
 	* Change from ASCII to UTF-8 for the language character set and also 
 	  allow any characters inside comments.

{pyopengl-3.1.9a2 → pyopengl-3.1.10}/OpenGL/GL/ARB/vertex_shader.py

@@ -128,26 +128,32 @@ from OpenGL._bytes import bytes, _NULL_8_BYTE, as_8_bit
 from OpenGL.lazywrapper import lazy as _lazy
 from OpenGL.GL.ARB.shader_objects import glGetObjectParameterivARB
 
-@_lazy( glGetActiveAttribARB )
+
+@_lazy(glGetActiveAttribARB)
 def glGetActiveAttribARB(baseOperation, program, index):
     """Retrieve the name, size and type of the uniform of the index in the program"""
-    max_index = int(glGetObjectParameterivARB( program, GL_OBJECT_ACTIVE_ATTRIBUTES_ARB ))
-    length = int(glGetObjectParameterivARB( program, GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB))
+    max_index = int(glGetObjectParameterivARB(program, GL_OBJECT_ACTIVE_ATTRIBUTES_ARB))
+    length = int(
+        glGetObjectParameterivARB(program, GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB)
+    )
     if index < max_index and index >= 0 and length > 0:
-        length,name,size,type = baseOperation( program, index )
-        if hasattr(name,'tostring'):
+        length, name, size, type = baseOperation(program, index)
+        if hasattr(name, 'tobytes'):
+            name = name.tobytes().rstrip(b'\000')
+        elif hasattr(name, 'tostring'):
             name = name.tostring().rstrip(b'\000')
-        elif hasattr(name,'value'):
+        elif hasattr(name, 'value'):
             name = name.value
-        return name,size,type
-    raise IndexError('index out of range from zero to %i' % (max_index - 1, ))
+        return name, size, type
+    raise IndexError('index out of range from zero to %i' % (max_index - 1,))
+
 
-@_lazy( glGetAttribLocationARB )
-def glGetAttribLocationARB( baseOperation, program, name ):
+@_lazy(glGetAttribLocationARB)
+def glGetAttribLocationARB(baseOperation, program, name):
     """Check that name is a string with a null byte at the end of it"""
     if not name:
-        raise ValueError( """Non-null name required""" )
-    name = as_8_bit( name )
+        raise ValueError("""Non-null name required""")
+    name = as_8_bit(name)
     if name[-1] != _NULL_8_BYTE:
         name = name + _NULL_8_BYTE
-    return baseOperation( program, name )
+    return baseOperation(program, name)

{pyopengl-3.1.9a2 → pyopengl-3.1.10}/OpenGL/GL/KHR/debug.py

@@ -196,6 +196,8 @@ glGetDebugMessageLogKHR=wrapper.wrapper(glGetDebugMessageLogKHR).setInputArraySi
 # INPUT glGetObjectLabelKHR.label size not checked against bufSize
 glGetObjectLabelKHR=wrapper.wrapper(glGetObjectLabelKHR).setInputArraySize(
     'label', None
+).setInputArraySize(
+    'length', 1
 )
 # INPUT glGetObjectPtrLabelKHR.label size not checked against bufSize
 glGetObjectPtrLabelKHR=wrapper.wrapper(glGetObjectPtrLabelKHR).setInputArraySize(

pyopengl-3.1.10/OpenGL/GL/MESA/texture_const_bandwidth.py

@@ -0,0 +1,34 @@
+'''OpenGL extension MESA.texture_const_bandwidth
+
+This module customises the behaviour of the 
+OpenGL.raw.GL.MESA.texture_const_bandwidth to provide a more 
+Python-friendly API
+
+Overview (from the spec)
+	
+	The use of data dependent bandwidth compressed formats (UBWC, AFBC, etc)
+	can introduce a form of side-channel, in that the bandwidth used for
+	texture access is dependent on the texture's contents.  In some cases
+	an application may want to disable the use of data dependent formats on
+	specific textures.
+	
+	For that purpose, this extension extends EXT_memory_object to introduce
+	a new <param> CONST_BW_TILING_MESA.
+
+The official definition of this extension is available here:
+http://www.opengl.org/registry/specs/MESA/texture_const_bandwidth.txt
+'''
+from OpenGL import platform, constant, arrays
+from OpenGL import extensions, wrapper
+import ctypes
+from OpenGL.raw.GL import _types, _glgets
+from OpenGL.raw.GL.MESA.texture_const_bandwidth import *
+from OpenGL.raw.GL.MESA.texture_const_bandwidth import _EXTENSION_NAME
+
+def glInitTextureConstBandwidthMESA():
+    '''Return boolean indicating whether this extension is available'''
+    from OpenGL import extensions
+    return extensions.hasGLExtension( _EXTENSION_NAME )
+
+
+### END AUTOGENERATED SECTION

{pyopengl-3.1.9a2 → pyopengl-3.1.10}/OpenGL/GL/NV/path_rendering.py

@@ -267,7 +267,7 @@ Overview (from the spec)
 	    GLfloat xtranslate[6+1];  // wordLen+1
 	    glGetPathSpacingNV(GL_ACCUM_ADJACENT_PAIRS_NV,
 	                       wordLen+1, GL_UNSIGNED_BYTE,
-	                       "\000\001\002\003\004\005\005",  // repeat last letter twice
+	                       "\\000\\001\\002\\003\\004\\005\\005",  // repeat last letter twice
 	                       glyphBase,
 	                       1.0f, 1.0f,
 	                       GL_TRANSLATE_X_NV,
@@ -295,7 +295,7 @@ Overview (from the spec)
 	each transformed by the appropriate 2D translations for spacing.
 	
 	    glStencilFillPathInstancedNV(6, GL_UNSIGNED_BYTE,
-	                                 "\000\001\002\003\004\005",
+	                                 "\\000\\001\\002\\003\\004\\005",
 	                                 glyphBase,
 	                                 GL_PATH_FILL_MODE_NV, 0xFF,
 	                                 GL_TRANSLATE_X_NV, xtranslate);
@@ -307,7 +307,7 @@ Overview (from the spec)
 	    glStencilOp(GL_KEEP, GL_KEEP, GL_ZERO);
 	    glColor3f(0.5,0.5,0.5); // 50% gray
 	    glCoverFillPathInstancedNV(6, GL_UNSIGNED_BYTE,
-	                               "\000\001\002\003\004\005",
+	                               "\\000\\001\\002\\003\\004\\005",
 	                               glyphBase,
 	                               GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV,
 	                               GL_TRANSLATE_X_NV, xtranslate);