diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2017-06-07 20:33:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-07 20:33:54 -0700 |
| commit | b11d722eeda67bc498f7bf727649fb4ae4e5f997 (patch) | |
| tree | 597b9596564442ac1c125f5f7332ffc6ec97ce03 /Source/Core/Common/GL/GLInterface/WGL.cpp | |
| parent | e6aa118f2111351c7fb38a611f3523793927addb (diff) | |
| parent | fd166032abec349b9fae7240830133bf7e0c77b5 (diff) | |
Merge pull request #5572 from shuffle2/msvc-w4
msvc: use /W4 (and fixes to make it work)
Diffstat (limited to 'Source/Core/Common/GL/GLInterface/WGL.cpp')
| -rw-r--r-- | Source/Core/Common/GL/GLInterface/WGL.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/Core/Common/GL/GLInterface/WGL.cpp b/Source/Core/Common/GL/GLInterface/WGL.cpp index 57c46cb42b..3e500f5866 100644 --- a/Source/Core/Common/GL/GLInterface/WGL.cpp +++ b/Source/Core/Common/GL/GLInterface/WGL.cpp @@ -248,8 +248,8 @@ bool cInterfaceWGL::Create(void* window_handle, bool core) return false; } - int pixel_format; - if (!(pixel_format = ChoosePixelFormat(m_dc, &pfd))) + int pixel_format = ChoosePixelFormat(m_dc, &pfd); + if (!pixel_format) { PanicAlert("(2) Can't find a suitable PixelFormat."); return false; @@ -261,7 +261,8 @@ bool cInterfaceWGL::Create(void* window_handle, bool core) return false; } - if (!(m_rc = wglCreateContext(m_dc))) + m_rc = wglCreateContext(m_dc); + if (!m_rc) { PanicAlert("(4) Can't create an OpenGL rendering context."); return false; |