mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A bit more OpenGL cleanup

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11085 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher 2016-01-29 15:59:11 +00:00
parent f5a6b10f46
commit 8717f1b252
2 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/Fl_Gl_Device_Plugin.cxx
View File

@ -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)
{

1
src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx
View File

@ -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());