diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2016-01-29 15:59:11 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2016-01-29 15:59:11 +0000 |
| commit | 8717f1b25285e132f40c0bfa580c45c29f840082 (patch) | |
| tree | 8cc7d0b8de841984720987286d94d8f834eea86f | |
| parent | f5a6b10f469d4ac15d5f52c6c1ccc3e8318861aa (diff) | |
A bit more OpenGL cleanup
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11085 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/Fl_Gl_Device_Plugin.cxx | 39 | ||||
| -rw-r--r-- | src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx | 1 |
2 files changed, 1 insertions, 39 deletions
diff --git a/src/Fl_Gl_Device_Plugin.cxx b/src/Fl_Gl_Device_Plugin.cxx index 50ee159b8..2df739627 100644 --- a/src/Fl_Gl_Device_Plugin.cxx +++ b/src/Fl_Gl_Device_Plugin.cxx @@ -31,45 +31,6 @@ #endif - -// FIXME: remove the code below -#if 0 -// ------ this should be in a separate file! ----------------------------------- -#ifdef FL_CFG_GFX_OPENGL - -#include <FL/Fl_Device.H> -#include <FL/gl.h> - -#include "drivers/OpenGL/Fl_OpenGL_Graphics_Driver.h" - -Fl_OpenGL_Display_Device *Fl_OpenGL_Display_Device::display_device() { - static Fl_OpenGL_Display_Device *display = new Fl_OpenGL_Display_Device(new Fl_OpenGL_Graphics_Driver()); - return display; -}; - -Fl_OpenGL_Display_Device::Fl_OpenGL_Display_Device(Fl_OpenGL_Graphics_Driver *graphics_driver) -: Fl_Surface_Device(graphics_driver) -{ -} - -const char *Fl_OpenGL_Display_Device::class_id = "Fl_OpenGL_Display_Device"; - -#endif -// ------ end of separate file! ------------------------------------------------ - -#include "drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx" -#include "drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.cxx" -#include "drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx" -#include "drivers/OpenGL/Fl_OpenGL_Graphics_Driver_image.cxx" -#include "drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.cxx" -#include "drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx" -#include "drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.cxx" - -#endif - - - - #if defined(__APPLE__) uchar *convert_BGRA_to_RGB(uchar *baseAddress, int w, int h, int mByteWidth) { diff --git a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx index c4e02dc83..b81e481c8 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx +++ b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx @@ -25,6 +25,7 @@ #include "Fl_OpenGL_Graphics_Driver.h" #include "Fl_OpenGL_Display_Device.h" +// TODO: much of Fl_Gl_Choice should probably go here Fl_OpenGL_Display_Device *Fl_OpenGL_Display_Device::display_device() { static Fl_OpenGL_Display_Device *display = new Fl_OpenGL_Display_Device(new Fl_OpenGL_Graphics_Driver()); |