Author: ArcRiley
Date: 2008-05-19 18:55:39 -0400 (Mon, 19 May 2008)
New Revision: 1277
Modified:
trunk/pysoy/include/soy.textures.pxd
trunk/pysoy/src/textures/NormalisationCubeMap.pym
trunk/pysoy/src/textures/Texture.pym
Log:
'''Pyrex 0.9.8.2 fixes''' :
* updated soy.textures with nogil
Modified: trunk/pysoy/include/soy.textures.pxd
===================================================================
--- trunk/pysoy/include/soy.textures.pxd 2008-05-19 20:24:10 UTC (rev
1276)
+++ trunk/pysoy/include/soy.textures.pxd 2008-05-19 22:55:39 UTC (rev
1277)
@@ -44,11 +44,12 @@
cdef int _types[3]
cdef int _formats[5]
# General C functions
- cdef void _resize(self, int, int, int, int, int) nogil
- cdef int _squareup(self, int) nogil
+ cdef void _resize ( self, int, int,
+ int, int, int ) nogil
+ cdef int _squareup ( self, int ) nogil
# WindowLoop functions
- cdef void _enable(self)
- cdef void _disable(self)
+ cdef void _enable ( self ) nogil
+ cdef void _disable ( self ) nogil
cdef class Print (Texture) :
@@ -73,4 +74,4 @@
cdef class NormalisationCubeMap(Texture):
cdef int _was_created
- cdef void _generate(self, int, int)
+ cdef void _generate ( self, int, int ) nogil
Modified: trunk/pysoy/src/textures/NormalisationCubeMap.pym
===================================================================
--- trunk/pysoy/src/textures/NormalisationCubeMap.pym 2008-05-19 20:24:10 UTC
(rev 1276)
+++ trunk/pysoy/src/textures/NormalisationCubeMap.pym 2008-05-19 22:55:39 UTC
(rev 1277)
@@ -8,7 +8,7 @@
self._generate(x,y)
- cdef void _generate(self, int x_size, int y_size):
+ cdef void _generate(self, int x_size, int y_size) nogil :
self._was_created = 1
self._target = gl.GL_TEXTURE_CUBE_MAP
self._bytes = 1
@@ -201,7 +201,7 @@
# WindowLoop Functions
#
- cdef void _enable(self):
+ cdef void _enable(self) nogil :
py.PyThread_acquire_lock(self._mutex,1)
if self._was_created == 0 :
self._generate(32,32)
@@ -209,7 +209,7 @@
gl.glBindTexture(self._target, self._textureID)
- cdef void _disable(self):
+ cdef void _disable(self) nogil :
gl.glDisable(self._target)
gl.glBindTexture(self._target, 0)
py.PyThread_release_lock(self._mutex)
Modified: trunk/pysoy/src/textures/Texture.pym
===================================================================
--- trunk/pysoy/src/textures/Texture.pym 2008-05-19 20:24:10 UTC (rev
1276)
+++ trunk/pysoy/src/textures/Texture.pym 2008-05-19 22:55:39 UTC (rev
1277)
@@ -177,7 +177,7 @@
# WindowLoop Functions
#
- cdef void _enable(self) :
+ cdef void _enable(self) nogil :
#
# Lock to prevent resizing while we render
py.PyThread_acquire_lock(self._mutex, 1)
@@ -249,7 +249,7 @@
# raise ValueError('Image size exceeds max texture size, which is %d
pixels for each side'%max_size)
- cdef void _disable(self) :
+ cdef void _disable(self) nogil :
if self._target == gl.GL_TEXTURE_1D :
gl.glDisable(gl.GL_TEXTURE_1D)
elif self._target == gl.GL_TEXTURE_2D :
_______________________________________________
PySoy-SVN mailing list
PySoy-SVN@pysoy.org
http://www.pysoy.org/mailman/listinfo/pysoy-svn
