diff options
author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-12-02 21:51:50 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2014-12-03 00:20:03 +0100 |
commit | a15a538fb191b1851f366716914822411b583c58 (patch) | |
tree | 2ab3d29f9f62627162922d2e31eb7bfc22ce566e /include | |
parent | 815f515b8ff14f0542ec5f7898ca98d589b193eb (diff) |
Revert "use boost::shared_ptr instead of manual ref counting"
This reverts commit 8eeb02dcc1a4bc99b083b1a591b4a70003a1604f.
Conflicts:
include/vcl/opengl/OpenGLContext.hxx
vcl/inc/openglgdiimpl.hxx
vcl/opengl/gdiimpl.cxx
Change-Id: I85cc7a46876ffba5ab861f6dd83b07da466b212b
Diffstat (limited to 'include')
-rw-r--r-- | include/vcl/opengl/OpenGLContext.hxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index 843821dd75d4..595a2aeaabac 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -211,6 +211,8 @@ public: bool AcquireFramebuffer( OpenGLFramebuffer* pFramebuffer ); OpenGLFramebuffer* AcquireFramebuffer( const OpenGLTexture& rTexture ); void ReleaseFramebuffer( OpenGLFramebuffer* pFramebuffer ); + void AddRef(); + void DeRef(); // retrieve a program from the cache or compile/link it OpenGLProgram* GetProgram( const OUString& rVertexShader, const OUString& rFragmentShader ); @@ -260,6 +262,7 @@ private: SystemChildWindow* m_pChildWindow; boost::scoped_ptr<SystemChildWindow> m_pChildWindowGC; bool mbInitialized; + int mnRefCount; bool mbRequestLegacyContext; bool mbUseDoubleBufferedRendering; bool mbRequestVirtualDevice; |