diff --git a/extra/line-art/line-art.factor b/extra/line-art/line-art.factor index 054f07f63f..9eb3dc2dda 100644 --- a/extra/line-art/line-art.factor +++ b/extra/line-art/line-art.factor @@ -187,7 +187,10 @@ main() ] if ; M: line-art-gadget graft* ( gadget -- ) - "2.0" { "GL_ARB_draw_buffers" "GL_ARB_shader_objects" "GL_ARB_multitexture" } + "2.0" { "GL_ARB_draw_buffers" + "GL_ARB_shader_objects" + "GL_ARB_multitexture" + "GL_ARB_texture_float" } require-gl-version-or-extensions { "GL_EXT_framebuffer_object" } require-gl-extensions GL_CULL_FACE glEnable diff --git a/extra/ui/ui.factor b/extra/ui/ui.factor index febb56e10f..8fc7247257 100755 --- a/extra/ui/ui.factor +++ b/extra/ui/ui.factor @@ -120,12 +120,10 @@ SYMBOL: ui-hook [ dup update-hand draw-world ] each ; : notify ( gadget -- ) - dup gadget-graft-state { - { { f t } [ dup activate-control dup graft* ] } - { { t f } [ dup activate-control dup ungraft* ] } - } case - dup gadget-graft-state first { f f } { t t } ? - swap set-gadget-graft-state ; + dup gadget-graft-state dup first { f f } { t t } ? pick set-gadget-graft-state { + { { f t } [ dup activate-control graft* ] } + { { t f } [ dup activate-control ungraft* ] } + } case ; : notify-queued ( -- ) graft-queue [ notify ] dlist-slurp ;