diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-10-02 13:35:53 +0200 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-10-02 13:35:53 +0200 |
| commit | 1fc23f85068008ba58961b9c9e6ecd67320f5500 (patch) | |
| tree | 4edf88bbbf1fd826144de1d82452e0ead9c4f19d /src/drivers/X11 | |
| parent | abc6709e8e93594152e27710f25f24c36318d520 (diff) | |
Clean use of virtual GLContext Fl_Gl_Window_Driver::create_gl_context().
Diffstat (limited to 'src/drivers/X11')
| -rw-r--r-- | src/drivers/X11/Fl_X11_Gl_Window_Driver.H | 4 | ||||
| -rw-r--r-- | src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/drivers/X11/Fl_X11_Gl_Window_Driver.H b/src/drivers/X11/Fl_X11_Gl_Window_Driver.H index 8043c0421..72c4af1e5 100644 --- a/src/drivers/X11/Fl_X11_Gl_Window_Driver.H +++ b/src/drivers/X11/Fl_X11_Gl_Window_Driver.H @@ -33,7 +33,7 @@ class Fl_X11_Gl_Window_Driver : public Fl_Gl_Window_Driver { virtual void swap_buffers(); virtual char swap_type(); virtual Fl_Gl_Choice *find(int m, const int *alistp); - virtual GLContext create_gl_context(Fl_Window* window, const Fl_Gl_Choice* g, int layer = 0); + virtual GLContext create_gl_context(Fl_Window* window, const Fl_Gl_Choice* g); virtual void set_gl_context(Fl_Window* w, GLContext context); virtual void delete_gl_context(GLContext); virtual void make_overlay_current(); @@ -48,7 +48,7 @@ class Fl_X11_Gl_Window_Driver : public Fl_Gl_Window_Driver { #if !USE_XFT virtual Fl_Font_Descriptor** fontnum_to_fontdescriptor(int fnum); #endif - static GLContext create_gl_context(XVisualInfo* vis); + //static GLContext create_gl_context(XVisualInfo* vis); }; diff --git a/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx index 90036b971..d0b79a09a 100644 --- a/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx @@ -253,8 +253,9 @@ static int ctxErrorHandler( Display *, XErrorEvent * ) return 0; } -GLContext Fl_X11_Gl_Window_Driver::create_gl_context(Fl_Window* window, const Fl_Gl_Choice* g, int layer) { - (void)window; (void)layer; +GLContext Fl_X11_Gl_Window_Driver::create_gl_context(Fl_Window* window, + const Fl_Gl_Choice* g) { + (void)window; GLContext shared_ctx = 0; if (context_list && nContext) shared_ctx = context_list[0]; @@ -302,6 +303,7 @@ GLContext Fl_X11_Gl_Window_Driver::create_gl_context(Fl_Window* window, const Fl return ctx; } +/* This is no longer used GLContext Fl_X11_Gl_Window_Driver::create_gl_context(XVisualInfo *vis) { GLContext shared_ctx = 0; if (context_list && nContext) shared_ctx = context_list[0]; @@ -309,7 +311,7 @@ GLContext Fl_X11_Gl_Window_Driver::create_gl_context(XVisualInfo *vis) { if (context) add_context(context); return context; -} +}*/ void Fl_X11_Gl_Window_Driver::set_gl_context(Fl_Window* w, GLContext context) { if (context != cached_context || w != cached_window) { |