Bug 1565365 - Let webgl.force-enabled apply to WebGL2 as well r=jgilbert
authorJan Andre Ikenmeyer <jan@ikenmeyer.eu>
Fri, 12 Jul 2019 02:34:19 +0000
changeset 546294 b82b1ad094e47bd8e3343a43582bb8099b864b5d
parent 546293 0026ebc1bfc1923a72010ad2616da51c3cef9711
child 546295 d379fd7381097a8f49b5e3061ab28b557974c6a9
push id2165
push userffxbld-merge
push dateMon, 14 Oct 2019 16:30:58 +0000
treeherdermozilla-release@0eae18af659f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert
bugs1565365
milestone70.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1565365 - Let webgl.force-enabled apply to WebGL2 as well r=jgilbert Differential Revision: https://phabricator.services.mozilla.com/D37821
dom/canvas/WebGLContext.cpp
--- a/dom/canvas/WebGLContext.cpp
+++ b/dom/canvas/WebGLContext.cpp
@@ -450,17 +450,17 @@ bool WebGLContext::CreateAndInitGL(
         "Can't use WebGL when recording or replaying "
         "(https://bugzil.la/1506467).";
     out_failReasons->push_back(reason);
     GenerateWarning("%s", reason.info.BeginReading());
     return false;
   }
 
   // WebGL2 is separately blocked:
-  if (IsWebGL2()) {
+  if (IsWebGL2() && !forceEnabled) {
     const nsCOMPtr<nsIGfxInfo> gfxInfo = services::GetGfxInfo();
     const auto feature = nsIGfxInfo::FEATURE_WEBGL2;
 
     FailureReason reason;
     if (IsFeatureInBlacklist(gfxInfo, feature, &reason.key)) {
       reason.info =
           "Refused to create WebGL2 context because of blacklist"
           " entry: ";