diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2006-08-17 09:49:43 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2006-08-17 09:49:43 +0000 |
| commit | 51d67574ecae4a7e898a854b23b79be59197cc4e (patch) | |
| tree | a40de38ebf1471fca6f68181b107eba5719de5c2 /src | |
| parent | ef48f007a1a8463abfccb118a6836718d497eb29 (diff) | |
New context_changed() function for OpenGL windows allowing efficient texture loading (str #1372)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5322 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Gl_Window.cxx | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx index 97246c278..f16f3ef28 100644 --- a/src/Fl_Gl_Window.cxx +++ b/src/Fl_Gl_Window.cxx @@ -88,8 +88,12 @@ void Fl_Gl_Window::show() { void Fl_Gl_Window::invalidate() { valid(0); + context_valid(0); #ifndef WIN32 - if (overlay) ((Fl_Gl_Window*)overlay)->valid(0); + if (overlay) { + ((Fl_Gl_Window*)overlay)->valid(0); + ((Fl_Gl_Window*)overlay)->context_valid(0); + } #endif } @@ -137,6 +141,7 @@ void Fl_Gl_Window::make_current() { mode_ &= ~NON_LOCAL_CONTEXT; context_ = fl_create_gl_context(this, g); valid(0); + context_valid(0); } fl_set_gl_context(this, context_); @@ -215,7 +220,10 @@ int fl_overlay_depth = 0; #endif void Fl_Gl_Window::flush() { - uchar save_valid = valid_; + uchar save_valid = valid_f_ & 1; +#if HAVE_GL_OVERLAY && defined(WIN32) + uchar save_valid_f = valid_f_; +#endif #ifdef __APPLE_QD__ //: clear previous clipping in this shared port @@ -256,7 +264,7 @@ void Fl_Gl_Window::flush() { fl_overlay = 1; draw_overlay(); fl_overlay = 0; - valid(save_valid); + valid_f_ = save_valid_f; wglSwapLayerBuffers(Fl_X::i(this)->private_dc, WGL_SWAP_OVERLAY1); // if only the overlay was damaged we are done, leave main layer alone: if (damage() == FL_DAMAGE_OVERLAY) { @@ -357,6 +365,7 @@ void Fl_Gl_Window::flush() { if (fixcursor) SetCursor(Fl_X::i(this)->cursor); #endif valid(1); + context_valid(1); } void Fl_Gl_Window::resize(int X,int Y,int W,int H) { @@ -408,7 +417,7 @@ void Fl_Gl_Window::init() { context_ = 0; g = 0; overlay = 0; - valid_ = 0; + valid_f_ = 0; damage1_ = 0; #if 0 // This breaks resizing on Linux/X11 |