diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-12-02 21:51:50 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-12-02 21:52:14 +0100 |
| commit | 8091457a237bad0fd95a8b4d2c93650ce7847169 (patch) | |
| tree | 0b4dd77833e2342a2dcf2236ca5e3f79b0003f97 /include/vcl | |
| parent | 6ae099ff431eec9ec3b6a532b0bfedff8fa43d37 (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/vcl')
| -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 f7afe97c08e5..9c39ec25a89c 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; |