Tweak windows and x11 backends to work with changes made for offscreen rendering

diff --git a/basis/ui/windows/windows.factor b/basis/ui/windows/windows.factor
index 1481287e9599351dd14c4216de13a171a08d0eea..f6f449625f0a5fec22ab1265234ee97e8ec8664e 100755 (executable)
--- a/basis/ui/windows/windows.factor
+++ b/basis/ui/windows/windows.factor
@@ -498,10 +498,10 @@ M: windows-ui-backend (open-window) ( world -- )
     dupd (>>handle)
     hWnd>> show-window ;
 
-M: windows-ui-backend select-gl-context ( handle -- )
+M: win select-gl-context ( handle -- )
     [ hDC>> ] keep hRC>> wglMakeCurrent win32-error=0/f ;
 
-M: windows-ui-backend flush-gl-context ( handle -- )
+M: win flush-gl-context ( handle -- )
     hDC>> SwapBuffers win32-error=0/f ;
 
 ! Move window to front

diff --git a/basis/ui/x11/x11.factor b/basis/ui/x11/x11.factor
index b65236d1f9b8734a94c716f4dbf283b322572097..6d6243449b68f67e519a2c92a9f73e68e98cdf24 100755 (executable)
--- a/basis/ui/x11/x11.factor
+++ b/basis/ui/x11/x11.factor
@@ -248,12 +248,12 @@ M: x11-ui-backend raise-window* ( world -- )
         dpy get swap window>> XRaiseWindow drop
     ] when* ;
 
-M: x11-ui-backend select-gl-context ( handle -- )
+M: x11-handle select-gl-context ( handle -- )
     dpy get swap
     dup window>> swap glx>> glXMakeCurrent
     [ "Failed to set current GLX context" throw ] unless ;
 
-M: x11-ui-backend flush-gl-context ( handle -- )
+M: x11-handle flush-gl-context ( handle -- )
     dpy get swap window>> glXSwapBuffers ;
 
 M: x11-ui-backend ui ( -- )