From 44f4d45b65ad9400417dc5e71a36b2372c0eb113 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Sun, 9 Feb 2014 13:01:23 -0500 Subject: Add define-guardian macro. * 2d/helpers.scm (define-guardian): New macro. * 2d/texture.scm (reap-textures): Delete it. (texture-guardian): Defined using define-guardian. --- 2d/texture.scm | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to '2d/texture.scm') diff --git a/2d/texture.scm b/2d/texture.scm index daa0568..faa2359 100644 --- a/2d/texture.scm +++ b/2d/texture.scm @@ -93,22 +93,14 @@ that will be rendered, in pixels." ;; Use a guardian and an after GC hook that ensures that OpenGL ;; textures are deleted when texture objects are GC'd. -(define texture-guardian (make-guardian)) - -(define (reap-textures) - (let loop ((texture (texture-guardian))) - (when texture - ;; Do not reap texture regions - (unless (texture-region? texture) - ;; When attempting to reap structures upon guile exit, the - ;; dynamic pointer to gl-delete-textures becomes invalid. So, we - ;; ignore the error and move on. - (catch 'misc-error - (lambda () (gl-delete-texture (texture-id texture))) - (lambda (key . args) #f))) - (loop (texture-guardian))))) - -(add-hook! after-gc-hook reap-textures) +(define-guardian texture-guardian + (lambda (texture) + ;; Do not reap texture regions + (unless (texture-region? texture) + ;; When attempting to reap structures upon guile exit, the + ;; dynamic pointer to gl-delete-textures becomes invalid. So, we + ;; ignore the error and move on. + (false-if-exception (gl-delete-texture (texture-id texture)))))) (define (bitmap->texture bitmap) "Translates a freeimage bitmap into an OpenGL texture." -- cgit v1.2.3