Backed out changeset 7f724ded7131 (bug 1609579) for causing valgrind bustage CLOSED TREE
authorshindli <shindli@mozilla.com>
Thu, 16 Jan 2020 09:22:15 +0200
changeset 510443 75b2943f6e6ab284629f0997e7d99e3e2adb396f
parent 510442 22135e7e31430e6cc90872111a0d7a6b5100bef1
child 510444 c697754d9059bfc503eba58a3f9a423607d9c1e9
push id37021
push userrmaries@mozilla.com
push dateThu, 16 Jan 2020 09:46:51 +0000
treeherdermozilla-central@7541d616ff87 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1609579
milestone74.0a1
backs out7f724ded7131469ea1264a47871de593cf189b11
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
Backed out changeset 7f724ded7131 (bug 1609579) for causing valgrind bustage CLOSED TREE
dom/canvas/WebGLSampler.cpp
--- a/dom/canvas/WebGLSampler.cpp
+++ b/dom/canvas/WebGLSampler.cpp
@@ -21,17 +21,17 @@ WebGLSampler::WebGLSampler(WebGLContext*
 WebGLSampler::~WebGLSampler() {
   if (!mContext) return;
   mContext->gl->fDeleteSamplers(1, &mGLName);
 }
 
 static bool ValidateSamplerParameterParams(WebGLContext* webgl, GLenum pname,
                                            const FloatOrInt& param) {
   const auto& paramInt = param.i;
-  bool pnameValid = true;
+
   switch (pname) {
     case LOCAL_GL_TEXTURE_MIN_FILTER:
       switch (paramInt) {
         case LOCAL_GL_NEAREST:
         case LOCAL_GL_LINEAR:
         case LOCAL_GL_NEAREST_MIPMAP_NEAREST:
         case LOCAL_GL_NEAREST_MIPMAP_LINEAR:
         case LOCAL_GL_LINEAR_MIPMAP_NEAREST:
@@ -95,32 +95,19 @@ static bool ValidateSamplerParameterPara
         case LOCAL_GL_NEVER:
           return true;
 
         default:
           break;
       }
       break;
 
-    case LOCAL_GL_TEXTURE_MAX_ANISOTROPY:
-      if (webgl->IsExtensionEnabled(
-              WebGLExtensionID::EXT_texture_filter_anisotropic)) {
-        return true;
-      }
-      pnameValid = false;
-      break;
-
     default:
-      pnameValid = false;
-      break;
-  }
-
-  if (!pnameValid) {
-    webgl->ErrorInvalidEnumInfo("pname", pname);
-    return false;
+      webgl->ErrorInvalidEnumInfo("pname", pname);
+      return false;
   }
 
   webgl->ErrorInvalidEnumInfo("param", paramInt);
   return false;
 }
 
 void WebGLSampler::SamplerParameter(GLenum pname, const FloatOrInt& param) {
   if (!ValidateSamplerParameterParams(mContext, pname, param)) return;