vcl/inc/openglgdiimpl.hxx | 2 ++ vcl/source/opengl/OpenGLContext.cxx | 2 +- vcl/unx/generic/gdi/salgdi.cxx | 9 +++++++++ 3 files changed, 12 insertions(+), 1 deletion(-)
New commits: commit b6e1483ff7596aa5cb4cbb22db11782bd91b62a6 Author: Markus Mohrhard <[email protected]> Date: Sat Oct 25 02:18:15 2014 +0200 that should be a SAL_WARN Change-Id: I331b635c1e5518e4fd70a5b6bf5ced7cbc51782a diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index b29c7a1..cd69fc7 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -635,7 +635,7 @@ bool OpenGLContext::ImplInit() #elif defined( UNX ) if( !glXMakeCurrent( m_aGLWin.dpy, m_aGLWin.win, m_aGLWin.ctx ) ) { - SAL_INFO("vcl.opengl", "unable to select current GLX context"); + SAL_WARN("vcl.opengl", "unable to select current GLX context"); return false; } commit e4a5ba4a97320e696e3c7f4a3a870264602f211a Author: Markus Mohrhard <[email protected]> Date: Sat Oct 25 02:16:51 2014 +0200 add OpenGLContext to OpenGL vcl rendering code Change-Id: I05d1033c04d892638262d4a6a3e76897470e1467 diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx index 6ce94cb..1a3b6e7 100644 --- a/vcl/inc/openglgdiimpl.hxx +++ b/vcl/inc/openglgdiimpl.hxx @@ -34,6 +34,8 @@ private: public: virtual ~OpenGLSalGraphicsImpl (); + OpenGLContext& GetOpenGLContext() { return maContext; } + virtual void freeResources() SAL_OVERRIDE; virtual bool setClipRegion( const vcl::Region& ) SAL_OVERRIDE; diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index 65a9ab6..94d03a9 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -151,6 +151,15 @@ void X11SalGraphics::SetDrawable( Drawable aDrawable, SalX11Screen nXScreen ) pImpl->mnPenPixel = GetPixel( pImpl->mnPenColor ); pImpl->mnBrushPixel = GetPixel( pImpl->mnBrushColor ); } + else + { + OpenGLSalGraphicsImpl* pOpenGLImpl = dynamic_cast<OpenGLSalGraphicsImpl*>(mpImpl.get()); + if (pOpenGLImpl) + { + pOpenGLImpl->GetOpenGLContext().init(GetXDisplay(), + GetDisplay()->GetDrawable(m_nXScreen), m_nXScreen.getXScreen()); + } + } nTextPixel_ = GetPixel( nTextColor_ ); } } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
