diff options
| author | Manolo Gouy <Manolo> | 2018-10-31 12:45:51 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2018-10-31 12:45:51 +0000 |
| commit | 6c8115ee9b30a89724df122c0af20c24ac6cfe52 (patch) | |
| tree | e9142b3a91954f2ca61c3a49fb855af7f6198909 /src/Fl_cocoa.mm | |
| parent | 22bcc7b4cacee37be4e0559c84c848d1f6b1daf6 (diff) | |
Remove use of Fl_Gl_Window_Driver.H in file src/Fl_cocoa.mm
Thus, Fl_cocoa.mm is completely independent from code of libfltk_gl.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@13104 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_cocoa.mm')
| -rw-r--r-- | src/Fl_cocoa.mm | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index e30b85943..dec3f3592 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -43,7 +43,6 @@ extern "C" { #include <FL/Fl_Tooltip.H> #include <FL/Fl_Printer.H> #include <FL/fl_draw.H> -#include "Fl_Gl_Window_Driver.H" #include "drivers/Quartz/Fl_Quartz_Graphics_Driver.H" #include "drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.H" #include "drivers/Cocoa/Fl_Cocoa_Screen_Driver.H" @@ -2811,7 +2810,7 @@ static CGContextRef prepare_bitmap_for_layer(int w, int h ) { @end -NSOpenGLPixelFormat* Fl_Cocoa_Gl_Window_Driver::mode_to_NSOpenGLPixelFormat(int m, const int *alistp) +NSOpenGLPixelFormat* Fl_Cocoa_Window_Driver::mode_to_NSOpenGLPixelFormat(int m, const int *alistp) { NSOpenGLPixelFormatAttribute attribs[32]; int n = 0; @@ -2899,7 +2898,7 @@ NSOpenGLPixelFormat* Fl_Cocoa_Gl_Window_Driver::mode_to_NSOpenGLPixelFormat(int return pixform; } -NSOpenGLContext* Fl_Cocoa_Gl_Window_Driver::create_GLcontext_for_window(NSOpenGLPixelFormat *pixelformat, +NSOpenGLContext* Fl_Cocoa_Window_Driver::create_GLcontext_for_window(NSOpenGLPixelFormat *pixelformat, NSOpenGLContext *shared_ctx, Fl_Window *window) { NSOpenGLContext *context = [[NSOpenGLContext alloc] initWithFormat:pixelformat shareContext:shared_ctx]; @@ -2919,27 +2918,27 @@ NSOpenGLContext* Fl_Cocoa_Gl_Window_Driver::create_GLcontext_for_window(NSOpenGL return context; } -void Fl_Cocoa_Gl_Window_Driver::GLcontext_update(NSOpenGLContext* ctxt) +void Fl_Cocoa_Window_Driver::GLcontext_update(NSOpenGLContext* ctxt) { [ctxt update]; } -void Fl_Cocoa_Gl_Window_Driver::flush_context(NSOpenGLContext* ctxt) +void Fl_Cocoa_Window_Driver::flush_context(NSOpenGLContext* ctxt) { [ctxt flushBuffer]; } -void Fl_Cocoa_Gl_Window_Driver::GLcontext_release(NSOpenGLContext* ctxt) +void Fl_Cocoa_Window_Driver::GLcontext_release(NSOpenGLContext* ctxt) { [ctxt release]; } -void Fl_Cocoa_Gl_Window_Driver::GL_cleardrawable(void) +void Fl_Cocoa_Window_Driver::GL_cleardrawable(void) { [[NSOpenGLContext currentContext] clearDrawable]; } -void Fl_Cocoa_Gl_Window_Driver::GLcontext_makecurrent(NSOpenGLContext* ctxt) +void Fl_Cocoa_Window_Driver::GLcontext_makecurrent(NSOpenGLContext* ctxt) { [ctxt makeCurrentContext]; } |
