summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-11-14 19:12:11 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-11-15 14:43:42 +0100
commit1e15058e08445d2857755ec8ef06deb2e3393b97 (patch)
treea16948aa97dca90e82446168c1590b4602718071 /vcl
parent340888d3e5c51d39ceb1642e50e9b62c6996ac01 (diff)
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
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/opengl/OpenGLContext.cxx5
1 files changed, 1 insertions, 4 deletions
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 8f691e729226..4f6d1302152e 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