summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-12-08 13:40:34 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-12-08 13:48:39 +0000
commit2109e7d9a0d3dab172961ec19e75da1fa8a6cc61 (patch)
tree88a856ae7f50a0b59725a6fbdbbd80d3181c7dd0
parentb42225d5d11a78e186797d9753ff40867f6b678a (diff)
the return from ImplInit *is* checked
bool WinOpenGLContext::init(HDC hDC, HWND hWnd) { ... return ImplInit(); } rtl::Reference<OpenGLContext> WinOpenGLSalGraphicsImpl::CreateWinContext() { ... if (!xContext->init(mrWinParent.mhLocalDC, mrWinParent.mhWnd)) } etc. Another problem here is ... "If we notice that OpenGL is broken the first time being called, it is not too late to call disableOpenGLAndTerminateForRestart(). The first time this will be called is from displaying the splash screen" isn't true when the first start causes opengl to be disabled, then on subsequent starts you can enter this function from launching an opengl slide transition. (note opengl is disabled if opengl is < 30, so all the versioning checks the slide transitions do is probably pointless now. The only actually useful use of opengl we have seems to be somewhat unloved) Change-Id: I1e159f826447520f39ea063fd4c0c83220b1385f
-rw-r--r--vcl/opengl/win/gdiimpl.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 6215c4c20a2d..3f5da83dd84c 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -473,9 +473,8 @@ bool compiledShaderBinariesWork()
bool WinOpenGLContext::ImplInit()
{
- // Failures here typically means that OpenGL can't be used. Returning false is fairly pointless
- // as the calling code doesn't even check, but oh well. If we notice that OpenGL is broken the
- // first time being called, it is not too late to call
+ // Failures here typically means that OpenGL can't be used.
+ // If we notice that OpenGL is broken the first time being called, it is not too late to call
// disableOpenGLAndTerminateForRestart(). The first time this will be called is from displaying
// the splash screen, so if OpenGL is broken, it is "early enough" for us to be able to disable
// OpenGL and terminate bluntly with EXITHELPER_NORMAL_RESTART, thus causing the wrapper process