mirror of
https://github.com/fltk/fltk.git
synced 2026-05-22 07:01:34 +08:00
Fix OpenGL context caching on macOS (#737)
This commit is contained in:
@@ -536,7 +536,6 @@ float Fl_Gl_Window::pixels_per_unit() {
|
||||
*/
|
||||
|
||||
int Fl_Gl_Window_Driver::copy = COPY;
|
||||
GLContext Fl_Gl_Window_Driver::cached_context = NULL;
|
||||
Fl_Window* Fl_Gl_Window_Driver::cached_window = NULL;
|
||||
float Fl_Gl_Window_Driver::gl_scale = 1; // scaling factor between FLTK and GL drawing units: GL = FLTK * gl_scale
|
||||
|
||||
|
||||
@@ -217,18 +217,18 @@ GLContext Fl_Cocoa_Gl_Window_Driver::create_gl_context(Fl_Window* window, const
|
||||
}
|
||||
|
||||
void Fl_Cocoa_Gl_Window_Driver::set_gl_context(Fl_Window* w, GLContext context) {
|
||||
if (context != cached_context || w != cached_window) {
|
||||
cached_context = context;
|
||||
NSOpenGLContext *current_context = [NSOpenGLContext currentContext];
|
||||
if (context != current_context || w != cached_window) {
|
||||
cached_window = w;
|
||||
[(NSOpenGLContext*)context makeCurrentContext];
|
||||
}
|
||||
}
|
||||
|
||||
void Fl_Cocoa_Gl_Window_Driver::delete_gl_context(GLContext context) {
|
||||
if (cached_context == context) {
|
||||
cached_context = 0;
|
||||
NSOpenGLContext *current_context = [NSOpenGLContext currentContext];
|
||||
if (current_context == context) {
|
||||
cached_window = 0;
|
||||
[[NSOpenGLContext currentContext] clearDrawable];
|
||||
[current_context clearDrawable];
|
||||
}
|
||||
[(NSOpenGLContext*)context release];
|
||||
del_context(context);
|
||||
|
||||
Reference in New Issue
Block a user