diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2020-12-04 12:14:47 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@collabora.com> | 2020-12-07 20:46:49 +0100 |
commit | db89f53c31af997b9bf422b0e784afba8d62a42e (patch) | |
tree | da11fedb71f01b6d21a32f95c0a9ccecb43fc265 /include/vcl/opengl | |
parent | 6265cfca9d775198e81166b914f5dcaea58802db (diff) |
remove OpenGL VCL backend code
It is by now practically unmaintained, even bugreports in bugzilla
have been already closed for it. AFAICT this used to be really
used only on Windows, where it's no longer the default.
There's still some OpenGL code left, because there are still two
other places that use OpenGL. One is OpenGL slideshows, which
reuse some of the base OpenGL code (and I've checked they
still work even after this removal). Second one is OpenGL canvas,
which it seems has never been finished or enabled (or so it
most probably should be dumped too).
Change-Id: I7ea5aef77ec252eb8e712d167db591209be84a13
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107290
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'include/vcl/opengl')
-rw-r--r-- | include/vcl/opengl/OpenGLContext.hxx | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index c6807a6fe863..28884945a3a8 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -19,11 +19,6 @@ #include <memory> #include <unordered_map> -class OpenGLFramebuffer; -class OpenGLProgram; -class OpenGLTexture; -class RenderState; - /// Holds the information of our new child window struct VCL_DLLPUBLIC GLWindow { @@ -72,25 +67,12 @@ public: // use these methods right after setting a context to make sure drawing happens // in the right FBO (default one is for onscreen painting) - void BindFramebuffer( OpenGLFramebuffer* pFramebuffer ); void AcquireDefaultFramebuffer(); - OpenGLFramebuffer* AcquireFramebuffer( const OpenGLTexture& rTexture ); - static void ReleaseFramebuffer( OpenGLFramebuffer* pFramebuffer ); void UnbindTextureFromFramebuffers( GLuint nTexture ); static bool IsTextureAttachedAnywhere( GLuint nTexture ); - void ReleaseFramebuffer( const OpenGLTexture& rTexture ); void ReleaseFramebuffers(); - // retrieve a program from the cache or compile/link it - OpenGLProgram* GetProgram( const OUString& rVertexShader, const OUString& rFragmentShader, const OString& preamble = "" ); - OpenGLProgram* UseProgram( const OUString& rVertexShader, const OUString& rFragmentShader, const OString& preamble = "" ); - - RenderState& state() - { - return *mpRenderState; - } - OpenGLCapabilitySwitch& getOpenGLCapabilitySwitch() { return maOpenGLCapabilitySwitch; @@ -107,10 +89,6 @@ public: /// Is there a current GL context ? static bool hasCurrent(); - /// make a VCL context (any context) current, create it if necessary. - static void makeVCLCurrent(); - /// fetch any VCL context, creating one if bMakeIfNecessary is set. - static rtl::Reference<OpenGLContext> getVCLContext(bool bMakeIfNecessary = true); /// make this GL context current - so it is implicit in subsequent GL calls virtual void makeCurrent(); /// Put this GL context to the end of the context list. @@ -134,10 +112,6 @@ public: return mbInitialized; } - /// VCL promiscuously re-uses its own contexts: - void setVCLOnly() { mbVCLOnly = true; } - bool isVCLOnly() const { return mbVCLOnly; } - virtual SystemWindowData generateWinData(vcl::Window* pParent, bool bRequestLegacyContext); private: @@ -159,22 +133,9 @@ protected: bool mbInitialized; int mnRefCount; bool mbRequestLegacyContext; - bool mbVCLOnly; - - int mnFramebufferCount; - OpenGLFramebuffer* mpCurrentFramebuffer; - OpenGLFramebuffer* mpFirstFramebuffer; - OpenGLFramebuffer* mpLastFramebuffer; OpenGLCapabilitySwitch maOpenGLCapabilitySwitch; -private: - typedef std::unordered_map< OString, std::shared_ptr<OpenGLProgram> > ProgramCollection; - ProgramCollection maPrograms; - OpenGLProgram* mpCurrentProgram; - - std::unique_ptr<RenderState> mpRenderState; - public: vcl::Region maClipRegion; |