From 7b51c9cbca692b2da959845a246847cec35e3939 Mon Sep 17 00:00:00 2001 From: Antoine Fontaine Date: Sun, 21 Mar 2021 21:45:53 +0100 Subject: [PATCH] gtkgl module: drop For some reason we have a gtkGL module from the beginning of the time, but it's not doing anything, and it's not used anywhere. This removes it. --- include/CMakeLists.txt | 1 - include/igtkgl.h | 42 ------------------------------- libs/gtkutil/glwidget.cpp | 1 - radiant/CMakeLists.txt | 1 - radiant/glwidget.cpp | 52 --------------------------------------- radiant/glwidget.h | 25 ------------------- 6 files changed, 122 deletions(-) delete mode 100644 include/igtkgl.h delete mode 100644 radiant/glwidget.cpp delete mode 100644 radiant/glwidget.h diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index f9db624c..05d4d9fc 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -14,7 +14,6 @@ add_library(includes ifilter.h igl.h iglrender.h - igtkgl.h iimage.h imap.h imodel.h diff --git a/include/igtkgl.h b/include/igtkgl.h deleted file mode 100644 index b4454564..00000000 --- a/include/igtkgl.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - Copyright (C) 2001-2006, William Joseph. - All Rights Reserved. - - This file is part of GtkRadiant. - - GtkRadiant is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - GtkRadiant is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GtkRadiant; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#if !defined( INCLUDED_IGTKGL_H ) -#define INCLUDED_IGTKGL_H - -#include -#include "generic/constant.h" - -template -using func = T *; - -struct _QERGtkGLTable { - STRING_CONSTANT(Name, "gtkgl"); - INTEGER_CONSTANT(Version, 1); - - func glwidget_new; - func glwidget_swap_buffers; - func glwidget_make_current; - func glwidget_destroy_context; - func glwidget_create_context; -}; - -#endif diff --git a/libs/gtkutil/glwidget.cpp b/libs/gtkutil/glwidget.cpp index f463b8b3..c597c4a9 100644 --- a/libs/gtkutil/glwidget.cpp +++ b/libs/gtkutil/glwidget.cpp @@ -92,7 +92,6 @@ bool glwidget_make_current(ui::GLArea self) // glwidget_context_created(self); // } gtk_gl_area_make_current(self); - auto valid = GlobalOpenGL().contextValid; return true; } diff --git a/radiant/CMakeLists.txt b/radiant/CMakeLists.txt index 3537a7dd..6c62139d 100644 --- a/radiant/CMakeLists.txt +++ b/radiant/CMakeLists.txt @@ -36,7 +36,6 @@ set(RADIANTLIST filetypes.cpp filetypes.h filters.cpp filters.h findtexturedialog.cpp findtexturedialog.h - glwidget.cpp glwidget.h grid.cpp grid.h groupdialog.cpp groupdialog.h gtkdlgs.cpp gtkdlgs.h diff --git a/radiant/glwidget.cpp b/radiant/glwidget.cpp deleted file mode 100644 index 0820d787..00000000 --- a/radiant/glwidget.cpp +++ /dev/null @@ -1,52 +0,0 @@ -/* - Copyright (C) 2001-2006, William Joseph. - All Rights Reserved. - - This file is part of GtkRadiant. - - GtkRadiant is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - GtkRadiant is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GtkRadiant; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "glwidget.h" - -#include "igtkgl.h" -#include "modulesystem.h" -#include "gtkutil/glwidget.h" - -class GtkGLAPI -{ -_QERGtkGLTable m_gtkgl; -public: -typedef _QERGtkGLTable Type; -STRING_CONSTANT( Name, "*" ); - -GtkGLAPI(){ - m_gtkgl.glwidget_new = &glwidget_new; - m_gtkgl.glwidget_swap_buffers = &glwidget_swap_buffers; - m_gtkgl.glwidget_make_current = &glwidget_make_current; - m_gtkgl.glwidget_destroy_context = &glwidget_destroy_context; - m_gtkgl.glwidget_create_context = &glwidget_create_context; -} -_QERGtkGLTable* getTable(){ - return &m_gtkgl; -} -}; - -#include "modulesystem/singletonmodule.h" -#include "modulesystem/moduleregistry.h" - -typedef SingletonModule GtkGLModule; -typedef Static StaticGtkGLModule; -StaticRegisterModule staticRegisterGtkGL( StaticGtkGLModule::instance() ); diff --git a/radiant/glwidget.h b/radiant/glwidget.h deleted file mode 100644 index 0adad268..00000000 --- a/radiant/glwidget.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - Copyright (C) 2001-2006, William Joseph. - All Rights Reserved. - - This file is part of GtkRadiant. - - GtkRadiant is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - GtkRadiant is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GtkRadiant; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#if !defined( INCLUDED_GLWIDGET_H ) -#define INCLUDED_GLWIDGET_H - -#endif -- 2.39.2