diff options
| author | Manolo Gouy <Manolo> | 2014-12-20 07:19:23 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2014-12-20 07:19:23 +0000 |
| commit | f3a84c0ee5f88fe664d759106724f786c706f817 (patch) | |
| tree | 3541953164e2d24c31ae46ef11f2c2e86b3873a3 /src/gl_start.cxx | |
| parent | a7dc3ea9e24399f318a9478fbcffe04ff2870de6 (diff) | |
Changed OpenGL support for the Mac OS X platform: use cocoa instead of deprecated AGL.
All changes are mac-specific, except a very minor change in file src/gl_draw.cxx
where string drawing wrongly claimed to support @symbol, not possible
because symbols are drawn using non-GL primitives.
Unchanged application code can use the new FLTK code.
In addition, the new code allows mac applications to draw OpenGL scenes
at high resolution on so-called 'retina' displays, but this requires some
support from app code. They must call, before opening GL windows,
Fl::use_high_resolution(1);
and change their glViewport() calls as follows
glViewport(0, 0, pxel_w(), pixel_h());
This uses 2 new member functions of the Fl_Gl_Window class,
pixel_w() and pixel_h() returning the window dimensions in pixel
units, that is, twice the w() and h() when the window is mapped
on a retina display.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10498 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/gl_start.cxx')
| -rw-r--r-- | src/gl_start.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gl_start.cxx b/src/gl_start.cxx index 42ce1ee99..d9e5107b3 100644 --- a/src/gl_start.cxx +++ b/src/gl_start.cxx @@ -48,6 +48,7 @@ static Fl_Gl_Choice* gl_choice; #ifdef __APPLE__ static Fl_Gl_Choice* gl_choice; +extern void gl_context_update(NSOpenGLContext*); #endif Fl_Region XRectangleRegion(int x, int y, int w, int h); // in fl_rect.cxx @@ -61,14 +62,15 @@ void gl_start() { if (!gl_choice) Fl::gl_visual(0); context = fl_create_gl_context(Fl_Window::current(), gl_choice); #elif defined(__APPLE_QUARTZ__) - // warning: the Quartz version should probably use Core GL (CGL) instead of AGL context = fl_create_gl_context(Fl_Window::current(), gl_choice); #else # error Unsupported platform #endif } fl_set_gl_context(Fl_Window::current(), context); -#if !defined(WIN32) && !defined(__APPLE__) +#ifdef __APPLE__ + gl_context_update(context); // supports window resizing +#elif !defined(WIN32) glXWaitX(); #endif if (pw != Fl_Window::current()->w() || ph != Fl_Window::current()->h()) { @@ -110,7 +112,6 @@ int Fl::gl_visual(int mode, int *alist) { #elif defined(WIN32) gl_choice = c; #elif defined(__APPLE_QUARTZ__) - // warning: the Quartz version should probably use Core GL (CGL) instead of AGL gl_choice = c; #else # error Unsupported platform |