PyOpenGL-accelerate 4.0.0a8__tar.gz → 4.0.0b1__tar.gz

{pyopengl_accelerate-4.0.0a8 → pyopengl_accelerate-4.0.0b1}/OpenGL_accelerate/__init__.py

@@ -13,7 +13,7 @@ import re as _re
 #: the two share generated tables, the dependency is pinned to this number,
 #: and the extension refuses a PyOpenGL stating another.  A release bumps
 #: both this and ``OpenGL/version.py``.
-__version__ = "4.0.0a8"
+__version__ = "4.0.0b1"
 #: The numeric release ``__version__`` names, without a pre-release marker,
 #: which ``OpenGL.acceleratesupport`` compares with its floor.
 __version_tuple__ = tuple(

{pyopengl_accelerate-4.0.0a8 → pyopengl_accelerate-4.0.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyOpenGL-accelerate
-Version: 4.0.0a8
+Version: 4.0.0b1
 Summary: Cython-coded accelerators for PyOpenGL
 Home-page: http://pyopengl.sourceforge.net
 Download-URL: http://sourceforge.net/project/showfiles.php?group_id=5988
@@ -24,7 +24,7 @@ Classifier: Intended Audience :: Developers
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: license.txt
-Requires-Dist: PyOpenGL==4.0.0a8
+Requires-Dist: PyOpenGL==4.0.0b1
 Dynamic: download-url
 Dynamic: license-file
 Dynamic: requires-dist

{pyopengl_accelerate-4.0.0a8 → pyopengl_accelerate-4.0.0b1}/PyOpenGL_accelerate.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyOpenGL-accelerate
-Version: 4.0.0a8
+Version: 4.0.0b1
 Summary: Cython-coded accelerators for PyOpenGL
 Home-page: http://pyopengl.sourceforge.net
 Download-URL: http://sourceforge.net/project/showfiles.php?group_id=5988
@@ -24,7 +24,7 @@ Classifier: Intended Audience :: Developers
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: license.txt
-Requires-Dist: PyOpenGL==4.0.0a8
+Requires-Dist: PyOpenGL==4.0.0b1
 Dynamic: download-url
 Dynamic: license-file
 Dynamic: requires-dist

{pyopengl_accelerate-4.0.0a8 → pyopengl_accelerate-4.0.0b1}/PyOpenGL_accelerate.egg-info/SOURCES.txt

@@ -34,4 +34,5 @@ src/c/generated/pygl_WGL.c
 src/c/generated/pygl_generated.c
 src/c/generated/pygl_modules.c
 tests/test_arraydatatypeaccel.py
-tests/test_numpyaccel.py
+tests/test_numpyaccel.py
+tests/test_vbo_references.py

pyopengl_accelerate-4.0.0b1/PyOpenGL_accelerate.egg-info/requires.txt

@@ -0,0 +1 @@
+PyOpenGL==4.0.0b1

{pyopengl_accelerate-4.0.0a8 → pyopengl_accelerate-4.0.0b1}/src/vbo.pyx

@@ -9,10 +9,6 @@ try:
 except NameError as err:
     long = int
 
-cdef extern from "Python.h":
-    cdef void Py_XINCREF( object )
-    cdef void Py_XDECREF( object )
-
 _NULL = object()
 
 cdef class VBO:
@@ -90,11 +86,6 @@ cdef class VBO:
         self.target_spec = target
         self._copy_segments = []
         self._I_ = None
-    def __dealloc__( self ):
-        """Deallocate our references"""
-        if self.data is not None:
-            Py_XDECREF( self.data )
-            self.data = None
     @property
     def implementation( self ):
         """Retrieve our implementation reference"""
@@ -117,10 +108,7 @@ cdef class VBO:
         """Update our entire array with new data"""
         return self.c_set_array( data, size )
     cdef c_set_array( self, data, size ):
-        """Set our array pointer with incref/decref support"""
-        if self.data is not None:
-            Py_XDECREF( self.data )
-        Py_XINCREF( data )
+        """Hold ``data`` as the array; an attribute of the extension type holds its own reference"""
         self.data = data
         if size is None and self.data is not None:
             size = self.arrayType.arrayByteCount( self.data )
@@ -275,12 +263,7 @@ cdef class VBOOffset:
     cdef public unsigned int offset
     def __cinit__( self, VBO vbo, unsigned int offset ):
         self.vbo = vbo
-        Py_XINCREF( vbo )
         self.offset = offset
-    def __dealloc__( self ):
-        if self.vbo is not None:
-            Py_XDECREF( self.vbo )
-            self.vbo = None
 
     def __getattr__( self, key ):
         if key != 'vbo':

pyopengl_accelerate-4.0.0b1/tests/test_vbo_references.py

@@ -0,0 +1,46 @@
+"""The accelerated VBO holds its array and its offsets hold their VBO by ordinary references."""
+import gc
+import sys
+
+import numpy as np
+import pytest
+
+from OpenGL import acceleratesupport
+from OpenGL.arrays import vbo
+
+# Switched off is as good as absent: OpenGL.arrays.vbo is then the Python VBO.
+if not acceleratesupport.ACCELERATE_AVAILABLE:
+    pytest.skip('the accelerators are not in use here', allow_module_level=True)
+
+
+def test_the_vbo_is_the_accelerated_one():
+    assert vbo.VBO.__module__ == 'OpenGL_accelerate.vbo'
+    assert vbo.VBOOffset.__module__ == 'OpenGL_accelerate.vbo'
+
+
+def test_an_array_assigned_to_data_outlives_the_buffer():
+    """``data`` is a public attribute: an array put there is held like any other."""
+    first = np.zeros(4, 'f')
+    second = np.ones(4, 'f')
+    third = np.full(2, 2.0, 'f')
+    counts = [sys.getrefcount(item) for item in (first, second, third)]
+    buffer = vbo.VBO(first)
+    buffer.data = second
+    buffer.set_array(third)
+    buffer.data = second
+    del buffer
+    gc.collect()
+    assert [sys.getrefcount(item) for item in (first, second, third)] == counts
+
+
+def test_an_offset_holds_its_buffer_and_lets_it_go():
+    data = np.zeros(4, 'f')
+    buffer = vbo.VBO(data)
+    count = sys.getrefcount(buffer)
+    offset = buffer + 8
+    assert offset.offset == 8 and offset.vbo is buffer
+    offset.vbo = vbo.VBO(np.zeros(2, 'f'))
+    offset.vbo = buffer
+    del offset
+    gc.collect()
+    assert sys.getrefcount(buffer) == count

pyopengl_accelerate-4.0.0a8/PyOpenGL_accelerate.egg-info/requires.txt

@@ -1 +0,0 @@
-PyOpenGL==4.0.0a8