Backed out changeset 58d155b0b54a (bug 1624768) for mochitest failures at test_2_conformance2__renderbuffers__multisampled-depth-renderbuffer-initialization.html.
authorBrindusan Cristian <cbrindusan@mozilla.com>
Wed, 25 Mar 2020 06:00:00 +0200
changeset 520328 2abd352490a4bf2e3a9118b154c0e351c0bad314
parent 520327 64e1f15e54321ab0fd66eae40055bda59ccab4ec
child 520329 4ba2354af2808054e763a486fbf6f72adca7e18e
push id37247
push userbtara@mozilla.com
push dateWed, 25 Mar 2020 09:34:57 +0000
treeherdermozilla-central@2abd352490a4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1624768
milestone76.0a1
backs out58d155b0b54abe3fc6ce31261853b37bd2dcb538
first release with
nightly linux32
2abd352490a4 / 76.0a1 / 20200325093457 / files
nightly linux64
2abd352490a4 / 76.0a1 / 20200325093457 / files
nightly mac
2abd352490a4 / 76.0a1 / 20200325093457 / files
nightly win32
2abd352490a4 / 76.0a1 / 20200325093457 / files
nightly win64
2abd352490a4 / 76.0a1 / 20200325093457 / 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
Backed out changeset 58d155b0b54a (bug 1624768) for mochitest failures at test_2_conformance2__renderbuffers__multisampled-depth-renderbuffer-initialization.html.
dom/canvas/ClientWebGLContext.cpp
--- a/dom/canvas/ClientWebGLContext.cpp
+++ b/dom/canvas/ClientWebGLContext.cpp
@@ -3176,24 +3176,16 @@ void ClientWebGLContext::RenderbufferSto
   }
 
   if (!ValidateNonNegative("width", width) ||
       !ValidateNonNegative("height", height) ||
       !ValidateNonNegative("samples", samples)) {
     return;
   }
 
-  if (internalFormat == LOCAL_GL_DEPTH_STENCIL && samples > 0) {
-    // While our backend supports it trivially, the spec forbids it.
-    EnqueueError(LOCAL_GL_INVALID_OPERATION,
-                 "WebGL 1's DEPTH_STENCIL format may not be multisampled. Use "
-                 "DEPTH24_STENCIL8 when `samples > 0`.");
-    return;
-  }
-
   Run<RPROC(RenderbufferStorageMultisample)>(
       rb->mId, static_cast<uint32_t>(samples), internalFormat,
       static_cast<uint32_t>(width), static_cast<uint32_t>(height));
 }
 
 // --------------------------- Texture objects ---------------------------
 
 void ClientWebGLContext::ActiveTexture(const GLenum texUnitEnum) {