Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-04 06:24:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve Fl_Cocoa_Gl_Window_Driver::switch_to_GL1() to support multiple GL3 windows

Browse Source
This commit is contained in:
ManoloFLTK
2022-11-23 11:59:49 +01:00
parent be6e5fad72
commit 42b74919e5
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.mm
+9 -8
View File
@@ -447,11 +447,11 @@ FL_EXPORT NSOpenGLContext *fl_mac_glcontext(GLContext rc) {
view/GL context. view/GL context.
*/ */
static struct win_view { struct win_view {
Fl_Gl_Window *win; Fl_Gl_Window *win;
NSView *gl1view; NSView *gl1view;
NSOpenGLContext *gl1ctxt; NSOpenGLContext *gl1ctxt;
} win_view_struct; };
static void delayed_addgl1ctxt(struct win_view *data) { static void delayed_addgl1ctxt(struct win_view *data) {
@@ -465,24 +465,25 @@ static void delayed_addgl1ctxt(struct win_view *data) {
[data->gl1ctxt setView:data->gl1view]; [data->gl1ctxt setView:data->gl1view];
remove_gl_context_opacity(data->gl1ctxt); remove_gl_context_opacity(data->gl1ctxt);
data->win->redraw(); data->win->redraw();
delete data;
} }
void Fl_Cocoa_Gl_Window_Driver::switch_to_GL1() { void Fl_Cocoa_Gl_Window_Driver::switch_to_GL1() {
if (!gl1ctxt) { if (!gl1ctxt) {
NSView *view = [fl_xid(pWindow) contentView]; NSView *view = [fl_xid(pWindow) contentView];
win_view_struct.gl1view = [[NSView alloc] initWithFrame:[view frame]]; struct win_view *win_view_struct = new struct win_view;
[win_view_struct.gl1view setAutoresizingMask: win_view_struct->gl1view = [[NSView alloc] initWithFrame:[view frame]];
[win_view_struct->gl1view setAutoresizingMask:
NSViewWidthSizable|NSViewHeightSizable]; NSViewWidthSizable|NSViewHeightSizable];
NSOpenGLPixelFormat *gl1pixelformat = mode_to_NSOpenGLPixelFormat( NSOpenGLPixelFormat *gl1pixelformat = mode_to_NSOpenGLPixelFormat(
FL_RGB8 | FL_ALPHA | FL_SINGLE, NULL); FL_RGB8 | FL_ALPHA | FL_SINGLE, NULL);
gl1ctxt = [[NSOpenGLContext alloc] gl1ctxt = [[NSOpenGLContext alloc]
initWithFormat:gl1pixelformat shareContext:nil]; initWithFormat:gl1pixelformat shareContext:nil];
[gl1pixelformat release]; [gl1pixelformat release];
win_view_struct.win = pWindow; win_view_struct->win = pWindow;
win_view_struct.gl1ctxt = gl1ctxt; win_view_struct->gl1ctxt = gl1ctxt;
Fl::add_timeout(0.01, (Fl_Timeout_Handler)delayed_addgl1ctxt, Fl::add_timeout(0.01, (Fl_Timeout_Handler)delayed_addgl1ctxt, win_view_struct);
&win_view_struct);
} }
[gl1ctxt makeCurrentContext]; [gl1ctxt makeCurrentContext];
glClearColor(0., 0., 0., 0.); glClearColor(0., 0., 0., 0.);