No bug - Remove unused ValidateTextureTargetEnum. draft
authorJeff Gilbert (:jgilbert) <jgilbert@mozilla.com>
Wed, 28 Sep 2016 14:08:17 -0700
changeset 418649 ea41a8942cf8c30be543c5a495c37e64730ed05c
parent 418648 2d7e67a4000e16fa69ad667c5ba0457328818a44
child 418650 cd81021ec352fd2f063e36f386a8fb785baed91c
push id30738
push userbmo:jgilbert@mozilla.com
push dateWed, 28 Sep 2016 21:25:31 +0000
milestone52.0a1
No bug - Remove unused ValidateTextureTargetEnum. MozReview-Commit-ID: 98ZF44mPsNV
dom/canvas/WebGLContext.h
dom/canvas/WebGLContextValidate.cpp
--- a/dom/canvas/WebGLContext.h
+++ b/dom/canvas/WebGLContext.h
@@ -1259,17 +1259,16 @@ protected:
     bool InitAndValidateGL(FailureReason* const out_failReason);
 
     bool ValidateBlendEquationEnum(GLenum cap, const char* info);
     bool ValidateBlendFuncDstEnum(GLenum mode, const char* info);
     bool ValidateBlendFuncSrcEnum(GLenum mode, const char* info);
     bool ValidateBlendFuncEnumsCompatibility(GLenum sfactor, GLenum dfactor,
                                              const char* info);
     bool ValidateDataRanges(WebGLintptr readOffset, WebGLintptr writeOffset, WebGLsizeiptr size, const char* info);
-    bool ValidateTextureTargetEnum(GLenum target, const char* info);
     bool ValidateComparisonEnum(GLenum target, const char* info);
     bool ValidateStencilOpEnum(GLenum action, const char* info);
     bool ValidateFaceEnum(GLenum face, const char* info);
     bool ValidateTexInputData(GLenum type, js::Scalar::Type jsArrayType,
                               WebGLTexImageFunc func, WebGLTexDimensions dims);
     bool ValidateDrawModeEnum(GLenum mode, const char* info);
     bool ValidateAttribIndex(GLuint index, const char* info);
     bool ValidateAttribPointer(bool integerMode, GLuint index, GLint size, GLenum type,
--- a/dom/canvas/WebGLContextValidate.cpp
+++ b/dom/canvas/WebGLContextValidate.cpp
@@ -139,38 +139,16 @@ WebGLContext::ValidateDataRanges(WebGLin
         ErrorInvalidValue("%s: ranges [readOffset, readOffset + size) and [writeOffset, "
                           "writeOffset + size) overlap", info);
     }
 
     return separate;
 }
 
 bool
-WebGLContext::ValidateTextureTargetEnum(GLenum target, const char* info)
-{
-    switch (target) {
-    case LOCAL_GL_TEXTURE_2D:
-    case LOCAL_GL_TEXTURE_CUBE_MAP:
-        return true;
-
-    case LOCAL_GL_TEXTURE_3D:
-        if (IsWebGL2())
-            return true;
-
-        break;
-
-    default:
-        break;
-    }
-
-    ErrorInvalidEnumInfo(info, target);
-    return false;
-}
-
-bool
 WebGLContext::ValidateComparisonEnum(GLenum target, const char* info)
 {
     switch (target) {
     case LOCAL_GL_NEVER:
     case LOCAL_GL_LESS:
     case LOCAL_GL_LEQUAL:
     case LOCAL_GL_GREATER:
     case LOCAL_GL_GEQUAL: