array parameters also accept pointers

* figl/gl/types.scm (coerce-array-pointer): Renamed from
  array->pointer.  Also accept pointers, and perhaps typed-arrays in
  the future.  Removed excess lambda.

diff --git a/figl/gl/types.scm b/figl/gl/types.scm
index 1d14450..4ba5ff1 100644 (file)
--- a/figl/gl/types.scm
+++ b/figl/gl/types.scm
@@ -109,17 +109,23 @@
 (define-simple-foreign-type void-* '*)
 (define-simple-foreign-type const-GLvoid-* '*)
 
 (define-simple-foreign-type void-* '*)
 (define-simple-foreign-type const-GLvoid-* '*)
 

-(define (array->pointer x)
-  (lambda (x)
-    (if x
-        (ffi:bytevector->pointer x)
-        ffi:%null-pointer)))
+(define (coerce-array-pointer x)
+  (cond
+   ((ffi:pointer? x)
+    x)
+   ((bytevector? x)
+    (ffi:bytevector->pointer x))
+   ;; TODO: (typed-array? x element-type)
+   ((not x)
+    ffi:%null-pointer)
+   (else
+    (error "unhandled array-pointer type" x))))

 
 (define-syntax define-array-foreign-type
   (syntax-rules ()
     ((_ name element-type)
      (define-foreign-type name '*
 
 (define-syntax define-array-foreign-type
   (syntax-rules ()
     ((_ name element-type)
      (define-foreign-type name '*

-       array->pointer
+       coerce-array-pointer

        (lambda (x) x)))))
 
 (define-array-foreign-type GLboolean-* GLboolean)
        (lambda (x) x)))))
 
 (define-array-foreign-type GLboolean-* GLboolean)