Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 5 insertions, 68 deletions

diff --git a/gfx/angle/src/libANGLE/validationES2.h b/gfx/angle/src/libANGLE/validationES2.h
index d40a62606..09451f4c2 100755
--- a/gfx/angle/src/libANGLE/validationES2.h
+++ b/gfx/angle/src/libANGLE/validationES2.h
@@ -18,21 +18,9 @@ class Context;
 class ValidationContext;
 class Texture;
 
-bool ValidateES2TexImageParameters(Context *context,
-                                   GLenum target,
-                                   GLint level,
-                                   GLenum internalformat,
-                                   bool isCompressed,
-                                   bool isSubImage,
-                                   GLint xoffset,
-                                   GLint yoffset,
-                                   GLsizei width,
-                                   GLsizei height,
-                                   GLint border,
-                                   GLenum format,
-                                   GLenum type,
-                                   GLsizei imageSize,
-                                   const GLvoid *pixels);
+bool ValidateES2TexImageParameters(Context *context, GLenum target, GLint level, GLenum internalformat, bool isCompressed, bool isSubImage,
+                                   GLint xoffset, GLint yoffset, GLsizei width, GLsizei height,
+                                   GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 
 bool ValidateES2CopyTexImageParameters(ValidationContext *context,
                                        GLenum target,
@@ -50,6 +38,8 @@ bool ValidateES2CopyTexImageParameters(ValidationContext *context,
 bool ValidateES2TexStorageParameters(Context *context, GLenum target, GLsizei levels, GLenum internalformat,
                                                    GLsizei width, GLsizei height);
 
+bool ValidES2ReadFormatType(ValidationContext *context, GLenum format, GLenum type);
+
 bool ValidateDiscardFramebufferEXT(Context *context, GLenum target, GLsizei numAttachments,
                                    const GLenum *attachments);
 
@@ -149,17 +139,6 @@ bool ValidateTexImage2D(Context *context,
                         GLenum format,
                         GLenum type,
                         const GLvoid *pixels);
-bool ValidateTexImage2DRobust(Context *context,
-                              GLenum target,
-                              GLint level,
-                              GLint internalformat,
-                              GLsizei width,
-                              GLsizei height,
-                              GLint border,
-                              GLenum format,
-                              GLenum type,
-                              GLsizei bufSize,
-                              const GLvoid *pixels);
 bool ValidateTexSubImage2D(Context *context,
                            GLenum target,
                            GLint level,
@@ -170,17 +149,6 @@ bool ValidateTexSubImage2D(Context *context,
                            GLenum format,
                            GLenum type,
                            const GLvoid *pixels);
-bool ValidateTexSubImage2DRobustANGLE(Context *context,
-                                      GLenum target,
-                                      GLint level,
-                                      GLint xoffset,
-                                      GLint yoffset,
-                                      GLsizei width,
-                                      GLsizei height,
-                                      GLenum format,
-                                      GLenum type,
-                                      GLsizei bufSize,
-                                      const GLvoid *pixels);
 bool ValidateCompressedTexImage2D(Context *context,
                                   GLenum target,
                                   GLint level,
@@ -336,39 +304,8 @@ bool ValidateCopySubTextureCHROMIUM(Context *context,
                                     GLboolean unpackFlipY,
                                     GLboolean unpackPremultiplyAlpha,
                                     GLboolean unpackUnmultiplyAlpha);
-bool ValidateCompressedCopyTextureCHROMIUM(Context *context, GLuint sourceId, GLuint destId);
 
 bool ValidateCreateShader(Context *context, GLenum type);
-bool ValidateBufferData(ValidationContext *context,
-                        GLenum target,
-                        GLsizeiptr size,
-                        const GLvoid *data,
-                        GLenum usage);
-bool ValidateBufferSubData(ValidationContext *context,
-                           GLenum target,
-                           GLintptr offset,
-                           GLsizeiptr size,
-                           const GLvoid *data);
-
-bool ValidateEnableExtensionANGLE(ValidationContext *context, const GLchar *name);
-
-bool ValidateActiveTexture(ValidationContext *context, GLenum texture);
-bool ValidateAttachShader(ValidationContext *context, GLuint program, GLuint shader);
-bool ValidateBindAttribLocation(ValidationContext *context,
-                                GLuint program,
-                                GLuint index,
-                                const GLchar *name);
-bool ValidateBindBuffer(ValidationContext *context, GLenum target, GLuint buffer);
-bool ValidateBindFramebuffer(ValidationContext *context, GLenum target, GLuint framebuffer);
-bool ValidateBindRenderbuffer(ValidationContext *context, GLenum target, GLuint renderbuffer);
-bool ValidateBlendEquation(ValidationContext *context, GLenum mode);
-bool ValidateBlendEquationSeparate(ValidationContext *context, GLenum modeRGB, GLenum modeAlpha);
-bool ValidateBlendFunc(ValidationContext *context, GLenum sfactor, GLenum dfactor);
-bool ValidateBlendFuncSeparate(ValidationContext *context,
-                               GLenum srcRGB,
-                               GLenum dstRGB,
-                               GLenum srcAlpha,
-                               GLenum dstAlpha);
 
 }  // namespace gl