[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - vcl/source

[Jan Holesovsky]

 vcl/source/opengl/OpenGLContext.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 07802be53ba1582276c32876e2b5160e7927e225
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri Nov 14 19:12:11 2014 +0100

    windows opengl: Do not be _that_ eager with CHECK_GL_ERROR().
    
    Turns out that when you call glGetError() and OpenGL is not yet set up (or
    already turned down), it leads to an error; so when we check for errors in a
    loop, we never recover from that ;-)
    
    Change-Id: I849ad1dc30fc93ee1c021b446d9ad379bf9987c0

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index cbf2bf2..fbadeac 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -78,8 +78,6 @@ OpenGLContext::~OpenGLContext()
             glXDestroyGLXPixmap(m_aGLWin.dpy, m_aGLWin.glPix);
     }
 #endif
-
-    CHECK_GL_ERROR();
 }
 
 void OpenGLContext::requestLegacyContext()
@@ -299,8 +297,7 @@ bool InitMultisample(PIXELFORMATDESCRIPTOR pfd, int& rPixelFormat,
     ReleaseDC(hWnd, glWin.hDC);
     DestroyWindow(hWnd);
 
-    CHECK_GL_ERROR();
-    return  bArbMultisampleSupported;
+    return bArbMultisampleSupported;
 }
 #endif