graphics: framebuffer: Refactor make-framebuffer.

Removes unnecessary let-over-lambda.

1 files changed, 51 insertions, 52 deletions

diff --git a/chickadee/graphics/framebuffer.scm b/chickadee/graphics/framebuffer.scm
index 5a8be8d..da99223 100644
--- a/chickadee/graphics/framebuffer.scm
+++ b/chickadee/graphics/framebuffer.scm
@@ -94,60 +94,59 @@
   #:bind bind-framebuffer)
 
 (define %clear-color (transparency 0.0))
+(define %draw-buffers (bytevector->pointer (u32vector (version-3-0 color-attachment0))))
 
-(define make-framebuffer
-  (let ((draw-buffers (u32vector (version-3-0 color-attachment0))))
-    (lambda* (width height #:key (min-filter 'linear) (mag-filter 'linear)
-                    (wrap-s 'repeat) (wrap-t 'repeat))
-      "Create a new framebuffer that renders to a texture with
+(define* (make-framebuffer width height #:key (min-filter 'linear) (mag-filter 'linear)
+                           (wrap-s 'repeat) (wrap-t 'repeat))
+  "Create a new framebuffer that renders to a texture with
 dimensions WIDTH x HEIGHT."
-      (assert-current-graphics-engine)
-      (let* ((framebuffer-id (generate-framebuffer))
-             (renderbuffer-id (generate-renderbuffer))
-             (texture (make-texture #f width height
-                                    #:flip? #t
-                                    #:min-filter min-filter
-                                    #:mag-filter mag-filter
-                                    #:wrap-s wrap-s
-                                    #:wrap-t wrap-t))
-             ;; It is convenient to make a default viewport and
-             ;; projection matrix for the framebuffer so that the
-             ;; rendering engine can set it whenever it changes to
-             ;; this framebuffer, saving users the trouble of having
-             ;; to this tedious task themselves.
-             (viewport (make-viewport 0 0 width height #:clear-color %clear-color))
-             (projection (orthographic-projection 0 width height 0 0 1))
-             (framebuffer (%make-framebuffer framebuffer-id
-                                             renderbuffer-id
-                                             texture
-                                             viewport
-                                             projection)))
-        (graphics-engine-guard! framebuffer)
-        (with-graphics-state! ((framebuffer framebuffer))
-          ;; Setup depth buffer.
-          (gl-bind-renderbuffer (version-3-0 renderbuffer)
-                                renderbuffer-id)
-          (gl-renderbuffer-storage (version-3-0 renderbuffer)
-                                   (pixel-format depth-component)
-                                   width
-                                   height)
-          (gl-framebuffer-renderbuffer (version-3-0 framebuffer)
-                                       (arb-framebuffer-object depth-attachment)
-                                       (version-3-0 renderbuffer)
-                                       renderbuffer-id)
-          ;; Setup framebuffer.
-          (gl-framebuffer-texture-2d (version-3-0 framebuffer)
-                                     (version-3-0 color-attachment0)
-                                     (texture-target texture-2d)
-                                     ((@@ (chickadee graphics texture) texture-id)
-                                      texture)
-                                     0)
-          (gl-draw-buffers 1 (bytevector->pointer draw-buffers)))
-        ;; Check for errors.
-        (unless (= (gl-check-framebuffer-status (version-3-0 framebuffer))
-                   (version-3-0 framebuffer-complete))
-          (error "Framebuffer cannot be created"))
-        framebuffer))))
+  (assert-current-graphics-engine)
+  (let* ((framebuffer-id (generate-framebuffer))
+         (renderbuffer-id (generate-renderbuffer))
+         (texture (make-texture #f width height
+                                #:flip? #t
+                                #:min-filter min-filter
+                                #:mag-filter mag-filter
+                                #:wrap-s wrap-s
+                                #:wrap-t wrap-t))
+         ;; It is convenient to make a default viewport and
+         ;; projection matrix for the framebuffer so that the
+         ;; rendering engine can set it whenever it changes to
+         ;; this framebuffer, saving users the trouble of having
+         ;; to this tedious task themselves.
+         (viewport (make-viewport 0 0 width height #:clear-color %clear-color))
+         (projection (orthographic-projection 0 width height 0 0 1))
+         (framebuffer (%make-framebuffer framebuffer-id
+                                         renderbuffer-id
+                                         texture
+                                         viewport
+                                         projection)))
+    (graphics-engine-guard! framebuffer)
+    (with-graphics-state! ((framebuffer framebuffer))
+      ;; Setup depth buffer.
+      (gl-bind-renderbuffer (version-3-0 renderbuffer)
+                            renderbuffer-id)
+      (gl-renderbuffer-storage (version-3-0 renderbuffer)
+                               (pixel-format depth-component)
+                               width
+                               height)
+      (gl-framebuffer-renderbuffer (version-3-0 framebuffer)
+                                   (arb-framebuffer-object depth-attachment)
+                                   (version-3-0 renderbuffer)
+                                   renderbuffer-id)
+      ;; Setup framebuffer.
+      (gl-framebuffer-texture-2d (version-3-0 framebuffer)
+                                 (version-3-0 color-attachment0)
+                                 (texture-target texture-2d)
+                                 ((@@ (chickadee graphics texture) texture-id)
+                                  texture)
+                                 0)
+      (gl-draw-buffers 1 %draw-buffers))
+    ;; Check for errors.
+    (unless (= (gl-check-framebuffer-status (version-3-0 framebuffer))
+               (version-3-0 framebuffer-complete))
+      (error "Framebuffer cannot be created"))
+    framebuffer))
 
 (define-syntax-rule (with-framebuffer framebuffer body ...)
   ;; As a convenience, initialize the viewport and projection matrix