Minor

gl-features.lisp

@@ -254,9 +254,16 @@
 ;; KLUDGE: this sucks.
 (defvar *depth-mask* T)
 (defmacro with-depth-mask (mode &body body)
-  (let ((old-mode (gensym "OLD-MODE")))
+  (let ((old-mode (gensym "OLD-MODE"))
+        (new-mode (gensym "NEW-MODE"))
+        (thunk (gensym "THUNK")))
     `(let ((,old-mode *depth-mask*)
-           (*depth-mask* ,mode))
-       (gl:depth-mask *depth-mask*)
-       (multiple-value-prog1 (progn ,@body)
-         (gl:depth-mask ,old-mode)))))
+           (,new-mode ,mode))
+       (flet ((,thunk ()
+                ,@body))
+         (if (eq ,new-mode ,old-mode)
+             (,thunk)
+             (let ((*depth-mask* ,new-mode))
+               (gl:depth-mask ,new-mode)
+               (multiple-value-prog1 (,thunk)
+                 (gl:depth-mask ,old-mode))))))))

pipeline.lisp

@@ -143,6 +143,8 @@
       (setf (getf texspec :width) 'width))
     (unless (getf texspec :height)
       (setf (getf texspec :height) 'height))
+    (unless (getf texspec :depth)
+      (setf (getf texspec :depth) 'depth))
     (unless (getf texspec :target)
       (setf (getf texspec :target) :texture-2d))
     texspec))