diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-09-29 09:39:21 +0200 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-09-29 09:39:21 +0200 |
| commit | da66e21e1d5826639da2b8d3bd5ccd27920a4aad (patch) | |
| tree | e775f7d34d94970fedebf03da64b1d5e7cfcee38 /src | |
| parent | 283184a09a360724a61b9e256c16f799a73cf405 (diff) | |
Support of FLTK widgets in OpenGL 3 windows - cont'd.
This commit allows to switch between FL_DOUBLE / FL_SINGLE modes
in widget-containing GL3 windows.
Demo program examples/OpenGL3test is modified to show FLTK widgets
even if the platform does not support OpenGL 3.
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.cxx | 1 | ||||
| -rw-r--r-- | src/gl_draw.cxx | 14 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.cxx index bb4c53df1..3ee281b37 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.cxx +++ b/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.cxx @@ -27,7 +27,6 @@ #include <FL/Fl_Image_Surface.H> #include <dlfcn.h> -extern void gl_texture_reset(); #ifdef __OBJC__ @class NSOpenGLPixelFormat; diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx index 3104f161d..b786b830d 100644 --- a/src/gl_draw.cxx +++ b/src/gl_draw.cxx @@ -319,11 +319,6 @@ int gl_texture_fifo::already_known(const char *str, int n) static gl_texture_fifo *gl_fifo = NULL; // points to the texture pile class instance -void gl_texture_reset() -{ - if (gl_fifo) gl_texture_pile_height(gl_texture_pile_height()); -} - // Cross-platform implementation of the texture mechanism for text rendering // using textures with the alpha channel only. @@ -465,6 +460,15 @@ int gl_texture_pile_height(void) return gl_fifo->size(); } +/** To call after GL operations that may invalidate textures used to draw text in GL scenes + (e.g., switch between FL_DOUBLE / FL_SINGLE modes). + */ +void gl_texture_reset() +{ + if (gl_fifo) gl_texture_pile_height(gl_texture_pile_height()); +} + + /** Changes the maximum height of the pile of pre-computed string textures |