diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2015-01-22 19:26:26 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2015-01-22 19:26:26 +0100 |
| commit | f1a2adc95b2fc370288162128e271c9514d223f5 (patch) | |
| tree | 1a134d4acb7b09ed40a9ae89ac5511a11ced8f57 | |
| parent | 33af00a9ae3136e8aa0fe3183a49681383cd48c7 (diff) | |
we know it is an OpenGLSalGraphicsImpl
Change-Id: I408f5a77a11ec0e9fed6569163870a7e0d12167c
| -rw-r--r-- | include/vcl/opengl/OpenGLContext.hxx | 8 | ||||
| -rw-r--r-- | vcl/source/opengl/OpenGLContext.cxx | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index 0178e21ebcd0..5818be332392 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -61,7 +61,7 @@ class NSOpenGLView; class OpenGLFramebuffer; class OpenGLProgram; class OpenGLTexture; -class SalGraphicsImpl; +class OpenGLSalGraphicsImpl; /// Holds the information of our new child window struct GLWindow @@ -193,8 +193,8 @@ public: OpenGLFramebuffer* AcquireFramebuffer( const OpenGLTexture& rTexture ); void ReleaseFramebuffer( OpenGLFramebuffer* pFramebuffer ); #ifdef DBG_UTIL - void AddRef(SalGraphicsImpl*); - void DeRef(SalGraphicsImpl*); + void AddRef(OpenGLSalGraphicsImpl*); + void DeRef(OpenGLSalGraphicsImpl*); #else void AddRef(); void DeRef(); @@ -269,7 +269,7 @@ private: boost::ptr_map<ProgramKey, OpenGLProgram> maPrograms; OpenGLProgram* mpCurrentProgram; #ifdef DBG_UTIL - std::set<SalGraphicsImpl*> maParents; + std::set<OpenGLSalGraphicsImpl*> maParents; #endif public: diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index 5bd863dfcb44..36ab9d0afccd 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -33,6 +33,8 @@ #include <opengl/program.hxx> #include <opengl/texture.hxx> +#include "openglgdiimpl.hxx" + using namespace com::sun::star; #define MAX_FRAMEBUFFER_COUNT 30 @@ -104,7 +106,7 @@ OpenGLContext::~OpenGLContext() } #ifdef DBG_UTIL -void OpenGLContext::AddRef(SalGraphicsImpl* pImpl) +void OpenGLContext::AddRef(OpenGLSalGraphicsImpl* pImpl) { assert(mnRefCount > 0); mnRefCount++; @@ -112,7 +114,7 @@ void OpenGLContext::AddRef(SalGraphicsImpl* pImpl) maParents.insert(pImpl); } -void OpenGLContext::DeRef(SalGraphicsImpl* pImpl) +void OpenGLContext::DeRef(OpenGLSalGraphicsImpl* pImpl) { auto it = maParents.find(pImpl); |