vcl/opengl/gdiimpl.cxx | 2 +- vcl/unx/generic/app/saldisp.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit a68947bea8a93448cf5fcb0c866a6cfb429263f3 Author: Markus Mohrhard <[email protected]> Date: Sun Nov 16 11:43:38 2014 +0100 Revert "make something visible on the screen again" This reverts commit 6661fdab95b981843f6d8392769f32e7377eaaeb. diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx index 9485088..5c5eae3 100644 --- a/vcl/opengl/gdiimpl.cxx +++ b/vcl/opengl/gdiimpl.cxx @@ -1508,7 +1508,7 @@ void OpenGLSalGraphicsImpl::endPaint() if( mnPainting == 0 ) { maContext.makeCurrent(); - maContext.swapBuffers(); + glFlush(); } } commit a7be267dea2c8503fc73f6ddd4a9f47a81af9744 Author: Markus Mohrhard <[email protected]> Date: Sun Nov 16 11:43:07 2014 +0100 use the OpenGLHelper version to check for OpenGL support Change-Id: Ib101d2605e5e739bb1d063fa7019e4e5930462a0 diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index ffd12d7..779453e 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -193,7 +193,7 @@ bool SalDisplay::BestVisual( Display *pDisplay, return rVI.visualid == nDefVID; try { - bool bUseOpenGL = officecfg::Office::Common::VCL::UseOpenGL::get(); + bool bUseOpenGL = OpenGLHelper::isVCLOpenGLEnabled(); if( bUseOpenGL && OpenGLHelper::GetVisualInfo( pDisplay, nScreen, rVI ) ) return rVI.visualid == nDefVID; } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
