diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-08-19 21:45:42 +0200 |
---|---|---|
committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-08-20 09:55:38 +0200 |
commit | 9ca30cd1d04cf39411c3ede687805c28ebe2a980 (patch) | |
tree | 909b3571e62663024f842fa9d9eb237ced9e4e21 /vcl/inc/salinst.hxx | |
parent | 3ad6d41c1c88b0549c9be0f41e02d83a582fcdfd (diff) |
VCL allow plugins to declare OpenGL support
... and get rid of the whole GetBackendCapabilities, which was
just overkill. Maybe this should even be some bitmap + enum
+ set/get function, but I'm too lazy...
In the end add a bool for the OpenGL support of the VCL plugin
(or maybe sticking it into ImplSVData, which is already some
catchall for common VCL data).
Change-Id: I9f0ececac482d8e2a94ef6024628e9631b49e773
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120760
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/inc/salinst.hxx')
-rw-r--r-- | vcl/inc/salinst.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index f38d6f45e44c..1c61dc029cc6 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -26,8 +26,6 @@ #include <vcl/salgtype.hxx> #include <vcl/vclenum.hxx> -#include "backend/BackendCapabilities.hxx" - #include "displayconnectiondispatch.hxx" #include <com/sun/star/uno/XComponentContext.hpp> @@ -80,10 +78,17 @@ private: const std::unique_ptr<comphelper::SolarMutex> m_pYieldMutex; css::uno::Reference<css::uno::XInterface> m_clipboard; +protected: + bool m_bSupportsBitmap32 = false; + bool m_bSupportsOpenGL = true; + public: SalInstance(std::unique_ptr<comphelper::SolarMutex> pMutex); virtual ~SalInstance(); + bool supportsBitmap32() const { return m_bSupportsBitmap32; } + bool supportsOpenGL() const { return m_bSupportsOpenGL; } + //called directly after Application::Init virtual void AfterAppInit() {} virtual bool SVMainHook(int*) { return false; } @@ -128,11 +133,6 @@ public: virtual SalSystem* CreateSalSystem() = 0; // SalBitmap virtual std::shared_ptr<SalBitmap> CreateSalBitmap() = 0; - // BackendCapabilities - virtual std::shared_ptr<vcl::BackendCapabilities> GetBackendCapabilities() - { - return std::make_shared<vcl::BackendCapabilities>(); - } // YieldMutex comphelper::SolarMutex* GetYieldMutex(); @@ -158,7 +158,7 @@ public: // may return NULL to disable session management, only used by X11 backend virtual std::unique_ptr<SalSession> CreateSalSession(); - virtual OpenGLContext* CreateOpenGLContext() = 0; + virtual OpenGLContext* CreateOpenGLContext(); virtual weld::Builder* CreateBuilder(weld::Widget* pParent, const OUString& rUIRoot, const OUString& rUIFile); virtual weld::Builder* CreateInterimBuilder(vcl::Window* pParent, const OUString& rUIRoot, const OUString& rUIFile, |