diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-12-07 20:31:45 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2020-12-08 10:09:29 +0100 |
| commit | 3b9e403751862a7938d656c4453189bc1d5ca646 (patch) | |
| tree | 561151d22d3cc8e2d0ae933e75f42b6f8b554f14 /vcl/unx | |
| parent | b7384249db1446cdbbd1f98d4c90c8d8d22c69b3 (diff) | |
remove more no longer needed OpenGL-related code
Change-Id: If7f47cf6dad860e4f8eab68931b72a38a7eda136
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107362
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 33 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/salvd.cxx | 2 |
2 files changed, 0 insertions, 35 deletions
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 <X11/extensions/Xinerama.h> #endif -#include <opengl/zone.hxx> - #include <i18nlangtag/languagetag.hxx> #include <tools/debug.hxx> #include <vcl/svapp.hxx> @@ -68,8 +66,6 @@ #include <unx/x11/xrender_peer.hxx> #include <unx/glyphcache.hxx> -#include <vcl/opengl/OpenGLHelper.hxx> - #include <poll.h> #include <memory> #include <vector> @@ -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 <unx/salvd.h> #include <unx/x11/xlimits.hxx> -#include <vcl/opengl/OpenGLHelper.hxx> - #include <config_features.h> #include <vcl/skia/SkiaHelper.hxx> #if HAVE_FEATURE_SKIA |