Bug 1489022 - Avoid be overwritten when WEBGL_MSAA is in the blacklist. r=jgilbert
authorDaosheng Mu <daoshengmu@gmail.com>
Thu, 06 Sep 2018 20:17:26 +0000
changeset 490890 409f3966645a651c8cb8d6d1e2f3fa995b69c739
parent 490889 4d5f4308428513f8c18cd05d87c96c75e19f9f30
child 490891 6f8b3a09e8d998be7a08db3e86daf534ad972f4e
child 490921 14b26ab738684504735f705c4228232dd9c9c4d9
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert
bugs1489022
milestone64.0a1
first release with
nightly linux32
409f3966645a / 64.0a1 / 20180907100116 / files
nightly linux64
409f3966645a / 64.0a1 / 20180907100116 / files
nightly mac
409f3966645a / 64.0a1 / 20180907100116 / files
nightly win32
409f3966645a / 64.0a1 / 20180907100116 / files
nightly win64
409f3966645a / 64.0a1 / 20180907100116 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1489022 - Avoid be overwritten when WEBGL_MSAA is in the blacklist. r=jgilbert MozReview-Commit-ID: 3HVTu2UQcFX Differential Revision: https://phabricator.services.mozilla.com/D5126
dom/canvas/WebGLContext.cpp
--- a/dom/canvas/WebGLContext.cpp
+++ b/dom/canvas/WebGLContext.cpp
@@ -410,17 +410,17 @@ WebGLContext::SetContextOptions(JSContex
     }
 
     if (!gfxPrefs::WebGLForceMSAA()) {
         const nsCOMPtr<nsIGfxInfo> gfxInfo = services::GetGfxInfo();
 
         nsCString blocklistId;
         if (IsFeatureInBlacklist(gfxInfo, nsIGfxInfo::FEATURE_WEBGL_MSAA, &blocklistId)) {
             GenerateWarning("Disallowing antialiased backbuffers due to blacklisting.");
-            mOptions.antialias = false;
+            newOpts.antialias = false;
         }
     }
 
 #if 0
     GenerateWarning("aaHint: %d stencil: %d depth: %d alpha: %d premult: %d preserve: %d\n",
                newOpts.antialias ? 1 : 0,
                newOpts.stencil ? 1 : 0,
                newOpts.depth ? 1 : 0,