From 3b9e403751862a7938d656c4453189bc1d5ca646 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Mon, 7 Dec 2020 20:31:45 +0100 Subject: remove more no longer needed OpenGL-related code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If7f47cf6dad860e4f8eab68931b72a38a7eda136 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107362 Tested-by: Jenkins Reviewed-by: Luboš Luňák --- Repository.mk | 1 - avmedia/source/inc/mediamisc.hxx | 2 -- canvas/inc/pch/precompiled_cairocanvas.hxx | 1 - canvas/source/cairo/cairo_canvas.cxx | 1 - canvas/source/directx/dx_canvas.cxx | 1 - canvas/source/factory/cf_service.cxx | 3 --- include/svx/unoshape.hxx | 1 - vcl/inc/salgdi.hxx | 1 - vcl/inc/salgdiimpl.hxx | 1 - vcl/inc/unx/saldisp.hxx | 1 - vcl/qa/cppunit/BackendTest.cxx | 1 - vcl/qa/cppunit/BitmapTest.cxx | 3 --- vcl/qa/cppunit/svm/svmtest.cxx | 3 --- vcl/source/app/svapp.cxx | 3 --- vcl/source/app/svdata.cxx | 3 --- vcl/source/gdi/bitmap3.cxx | 3 --- vcl/source/outdev/bitmap.cxx | 3 --- vcl/source/outdev/text.cxx | 3 --- vcl/source/window/event.cxx | 1 - vcl/source/window/status.cxx | 3 --- vcl/unx/generic/app/saldisp.cxx | 33 ------------------------------ vcl/unx/generic/gdi/salvd.cxx | 2 -- vcl/win/gdi/salfont.cxx | 1 - vcl/win/gdi/winlayout.cxx | 1 - vcl/workben/icontest.cxx | 2 -- 25 files changed, 78 deletions(-) diff --git a/Repository.mk b/Repository.mk index fce601fc0e79..9dea44f7db9c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -941,7 +941,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ wizards_wizardshare \ tipoftheday_images \ toolbarmode_images \ - vcl_opengl_shader \ vcl_theme_definitions \ $(if $(filter WNT,$(OS)), \ vcl_opengl_denylist \ diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx index 71bce74e3d28..97b2121cfaa1 100644 --- a/avmedia/source/inc/mediamisc.hxx +++ b/avmedia/source/inc/mediamisc.hxx @@ -32,8 +32,6 @@ #endif #endif -#define AVMEDIA_OPENGL_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_OpenGL" - // Mime types #define AVMEDIA_MIMETYPE_COMMON "application/vnd.sun.star.media" diff --git a/canvas/inc/pch/precompiled_cairocanvas.hxx b/canvas/inc/pch/precompiled_cairocanvas.hxx index ee38cccdc32f..c6350a84ebad 100644 --- a/canvas/inc/pch/precompiled_cairocanvas.hxx +++ b/canvas/inc/pch/precompiled_cairocanvas.hxx @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx index 394ffe773871..f8266cffe446 100644 --- a/canvas/source/cairo/cairo_canvas.cxx +++ b/canvas/source/cairo/cairo_canvas.cxx @@ -25,7 +25,6 @@ #include #include #include -#include #include #include diff --git a/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx index a571d4085d6d..3d5bda00288b 100644 --- a/canvas/source/directx/dx_canvas.cxx +++ b/canvas/source/directx/dx_canvas.cxx @@ -38,7 +38,6 @@ #include #include #include -#include #include #include diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index 608aaaf1d0a2..4e31197de2be 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -37,9 +37,6 @@ #include #include #include -#if HAVE_FEATURE_OPENGL -#include -#endif #include #include diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 1f948f50574b..dc0d94a80f9c 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -64,7 +64,6 @@ class SdrModel; class SvxDrawPage; class SvGlobalName; class Pair; -class IOpenGLRenderer; // Dimension arrows change size/position on save/reload (#i59051#) namespace basegfx diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 845183953e2c..d43e3b632d45 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -43,7 +43,6 @@ class SalLayout; class ImplLayoutArgs; namespace tools { class Rectangle; } class FontSubsetInfo; -class OpenGLContext; class OutputDevice; class FreetypeFont; struct SystemGraphicsData; diff --git a/vcl/inc/salgdiimpl.hxx b/vcl/inc/salgdiimpl.hxx index 1b60c59e0188..e349edadddc4 100644 --- a/vcl/inc/salgdiimpl.hxx +++ b/vcl/inc/salgdiimpl.hxx @@ -35,7 +35,6 @@ class SalGraphics; class SalBitmap; class SalFrame; class Gradient; -class OpenGLContext; class SalVirtualDevice; struct SalGradient; diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index c4fe3e747e59..c109a4335e62 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -314,7 +314,6 @@ protected: void addXineramaScreenUnique( int i, tools::Long i_nX, tools::Long i_nY, tools::Long i_nWidth, tools::Long i_nHeight ); Time GetEventTimeImpl( bool bAlwaysReget = false ) const; public: - static bool BestOpenGLVisual(Display* pDisplay, int nScreen, XVisualInfo& rVI); static bool BestVisual(Display *pDisp, int nScreen, XVisualInfo &rVI); SalDisplay( Display* pDisp ); diff --git a/vcl/qa/cppunit/BackendTest.cxx b/vcl/qa/cppunit/BackendTest.cxx index 94bf1e142960..0993e72397f3 100644 --- a/vcl/qa/cppunit/BackendTest.cxx +++ b/vcl/qa/cppunit/BackendTest.cxx @@ -84,7 +84,6 @@ public: // silently in case a new backend is added. #define SHOULD_ASSERT \ (assertBackendNameNotEmpty(aOutDevTest.getRenderBackendName()) \ - && aOutDevTest.getRenderBackendName() != "opengl" \ && aOutDevTest.getRenderBackendName() != "qt5" \ && aOutDevTest.getRenderBackendName() != "qt5svp" \ && aOutDevTest.getRenderBackendName() != "gtk3svp" \ diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx index 83c66691500c..67f897cd9ef4 100644 --- a/vcl/qa/cppunit/BitmapTest.cxx +++ b/vcl/qa/cppunit/BitmapTest.cxx @@ -20,9 +20,6 @@ #include #include -#if HAVE_FEATURE_OPENGL -#include -#endif #include #include diff --git a/vcl/qa/cppunit/svm/svmtest.cxx b/vcl/qa/cppunit/svm/svmtest.cxx index ee4a306e068d..868b9a2dc8d0 100644 --- a/vcl/qa/cppunit/svm/svmtest.cxx +++ b/vcl/qa/cppunit/svm/svmtest.cxx @@ -19,9 +19,6 @@ #include #include -#if HAVE_FEATURE_OPENGL -#include -#endif #include using namespace css; diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 032e141c34c1..340d7b91d4fe 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -48,9 +48,6 @@ #include #include #include -#if HAVE_FEATURE_OPENGL -#include -#endif #include #include diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index ce91212e96c0..29ccf348bc6a 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -49,9 +49,6 @@ #include #include -#if HAVE_FEATURE_OPENGL -#include -#endif #include #include diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 28e599f3cbed..a2c50583a2b4 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -26,9 +26,6 @@ #include #include #include -#if HAVE_FEATURE_OPENGL -#include -#endif #if HAVE_FEATURE_SKIA #include #endif diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index 3e35ec8d8540..6bc969bce1f4 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -28,9 +28,6 @@ #include #include #include -#if HAVE_FEATURE_OPENGL -#include -#endif #include #include #include diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 5677268ba0dd..42a753f29e3f 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -38,9 +38,6 @@ #include #include #include -#ifdef MACOSX -# include -#endif #include #include diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx index 5b9c4bd4823e..682dbd5a9fec 100644 --- a/vcl/source/window/event.cxx +++ b/vcl/source/window/event.cxx @@ -21,7 +21,6 @@ #include #include #include -#include #include #include diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index 55ddce975c24..e24a76da30c1 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -29,9 +29,6 @@ #include #include #include -#if HAVE_FEATURE_OPENGL -#include -#endif #include #include diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 94e3c416c3cc..efc154e14cb6 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -44,8 +44,6 @@ #include #endif -#include - #include #include #include @@ -68,8 +66,6 @@ #include #include -#include - #include #include #include @@ -174,30 +170,6 @@ sal_GetServerVendor( Display *p_display ) return vendor_unknown; } -bool SalDisplay::BestOpenGLVisual(Display* pDisplay, int nScreen, XVisualInfo& rVI) -{ - OpenGLZone aZone; - - XVisualInfo* pVI; - int aAttrib[] = { GLX_RGBA, - GLX_RED_SIZE, 8, - GLX_GREEN_SIZE, 8, - GLX_BLUE_SIZE, 8, - GLX_DEPTH_SIZE, 24, - GLX_STENCIL_SIZE, 8, - None }; - - pVI = glXChooseVisual( pDisplay, nScreen, aAttrib ); - if( !pVI ) - return false; - - rVI = *pVI; - XFree( pVI ); - - CHECK_GL_ERROR(); - return true; -} - bool SalDisplay::BestVisual( Display *pDisplay, int nScreen, XVisualInfo &rVI ) @@ -211,11 +183,6 @@ bool SalDisplay::BestVisual( Display *pDisplay, if( nVID && sal_GetVisualInfo( pDisplay, nVID, rVI ) ) return rVI.visualid == nDefVID; -// TODO SKIA - bool bUseOpenGL = OpenGLHelper::isVCLOpenGLEnabled(); - if (bUseOpenGL && BestOpenGLVisual(pDisplay, nScreen, rVI)) - return rVI.visualid == nDefVID; - XVisualInfo aVI; aVI.screen = nScreen; // get all visuals diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx index 16df0de25728..666be9c67112 100644 --- a/vcl/unx/generic/gdi/salvd.cxx +++ b/vcl/unx/generic/gdi/salvd.cxx @@ -28,8 +28,6 @@ #include #include -#include - #include #include #if HAVE_FEATURE_SKIA diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx index c3564880ee43..4b67b9d1e384 100644 --- a/vcl/win/gdi/salfont.cxx +++ b/vcl/win/gdi/salfont.cxx @@ -47,7 +47,6 @@ #include #include #include -#include #include #include diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx index 760ef40ab986..e4baa93f55eb 100644 --- a/vcl/win/gdi/winlayout.cxx +++ b/vcl/win/gdi/winlayout.cxx @@ -30,7 +30,6 @@ #include #include -#include #include #include #include diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx index ea6cb3e7195a..1ec9bac49c9f 100644 --- a/vcl/workben/icontest.cxx +++ b/vcl/workben/icontest.cxx @@ -38,8 +38,6 @@ #include #include #include -#include -#include #include #include #include -- cgit