Backed out changeset 04d79227660a (bug 1267879) for failing talos glterrain on Windows. r=backout

This commit is contained in:
Sebastian Hengst 2016-07-01 00:35:32 +02:00
parent 4c9f3f326e
commit 0642c8d7d3

View File

@ -204,7 +204,7 @@ WGLLibrary::EnsureInitialized()
MOZ_ASSERT(extString);
MOZ_ASSERT(HasExtension(extString, "WGL_ARB_extensions_string"));
if (HasExtension(extString, "WGL_ARB_create_context")) {
if (HasExtension(extString, "WGL_ARB_context_create")) {
if (GLLibraryLoader::LoadSymbols(mOGLLibrary, &robustnessSymbols[0], lookupFunc)) {
if (HasExtension(extString, "WGL_ARB_create_context_robustness")) {
mHasRobustness = true;
@ -553,8 +553,8 @@ CreatePBufferOffscreenContext(CreateContextFlags flags, const IntSize& aSize,
LOCAL_WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB, LOCAL_WGL_LOSE_CONTEXT_ON_RESET_ARB,
0
};
const HGLRC shareHandle = (aShareContext ? aShareContext->Context() : 0);
context = wgl.fCreateContextAttribs(pbdc, shareHandle, attribs);
context = wgl.fCreateContextAttribs(pbdc, aShareContext->Context(), attribs);
} else {
context = wgl.fCreateContext(pbdc);
if (context && aShareContext) {