diff options
| author | athenian200 <athenian200@outlook.com> | 2020-01-27 22:59:08 -0600 |
|---|---|---|
| committer | athenian200 <athenian200@outlook.com> | 2020-01-27 22:59:08 -0600 |
| commit | 3c4f414db74b84f7d2a6fb13fd888a47a153699b (patch) | |
| tree | ea81fca559849967a79d598a6f460830762ec9ea /gfx/gl/GLContextProviderWGL.cpp | |
| parent | 1f8d508258ac5d7d57fc4eb35cac90f28bc8ca03 (diff) | |
| parent | c4b0715baaffc541670fd1158557aa7e61e521d3 (diff) | |
| download | UXP-3c4f414db74b84f7d2a6fb13fd888a47a153699b.tar UXP-3c4f414db74b84f7d2a6fb13fd888a47a153699b.tar.gz UXP-3c4f414db74b84f7d2a6fb13fd888a47a153699b.tar.lz UXP-3c4f414db74b84f7d2a6fb13fd888a47a153699b.tar.xz UXP-3c4f414db74b84f7d2a6fb13fd888a47a153699b.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into form-disabled-issue
Diffstat (limited to 'gfx/gl/GLContextProviderWGL.cpp')
| -rw-r--r-- | gfx/gl/GLContextProviderWGL.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/gfx/gl/GLContextProviderWGL.cpp b/gfx/gl/GLContextProviderWGL.cpp index 35957259d..da8c93d10 100644 --- a/gfx/gl/GLContextProviderWGL.cpp +++ b/gfx/gl/GLContextProviderWGL.cpp @@ -314,20 +314,17 @@ GLContextWGL::Init() if (!mDC || !mContext) return false; - // see bug 929506 comment 29. wglGetProcAddress requires a current context. - if (!sWGLLib.fMakeCurrent(mDC, mContext)) - return false; - SetupLookupFunction(); - if (!InitWithPrefix("gl", true)) - return false; - - return true; + return InitWithPrefix("gl", true); } bool GLContextWGL::MakeCurrentImpl(bool aForce) { + if (IsDestroyed()) { + MOZ_ALWAYS_TRUE(sWGLLib.fMakeCurrent(0, 0)); + } + BOOL succeeded = true; // wglGetCurrentContext seems to just pull the HGLRC out |