From a26b19be1bba50243d118be90654f9aac3cbdfa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Renaud=20Casenave-P=C3=A9r=C3=A9?= Date: Tue, 21 Apr 2015 17:14:50 +0200 Subject: [PATCH] Enhance the gl-assert macro to include an implicit progn --- src/render/gl-utils.lisp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/render/gl-utils.lisp b/src/render/gl-utils.lisp index 62651d9..f58cca4 100644 --- a/src/render/gl-utils.lisp +++ b/src/render/gl-utils.lisp @@ -37,12 +37,15 @@ Store values like the drivers version." (and (<= maj *major-version*) (<= min *minor-version*)))) -(defmacro gl-assert (form) - `(prog1 - ,form - (let ((err-sym (%gl:get-error))) - (unless (eq err-sym :zero) - (error "The OpenGL command `~a'~%~2iresulted in an error: ~s~%" ',form err-sym))))) +(defmacro gl-assert (&body body) + `(progn + ,@(loop for form in body + collect `(prog1 + ,form + (let ((err-sym (%gl:get-error))) + (unless (eq err-sym :zero) + (error "The OpenGL command `~a'~%~2iresulted in an error: ~s~%" + ',form err-sym))))))) (defmacro gl-restart (form) `(restart-case