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

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

1 files changed, 3 insertions, 35 deletions

diff --git a/gfx/angle/src/libANGLE/validationES31.cpp b/gfx/angle/src/libANGLE/validationES31.cpp
index 4cea05e47..f7406090d 100755
--- a/gfx/angle/src/libANGLE/validationES31.cpp
+++ b/gfx/angle/src/libANGLE/validationES31.cpp
@@ -6,11 +6,10 @@
 
 // validationES31.cpp: Validation functions for OpenGL ES 3.1 entry point parameters
 
+#include "libANGLE/validationES3.h"
 #include "libANGLE/validationES31.h"
 
 #include "libANGLE/Context.h"
-#include "libANGLE/validationES.h"
-#include "libANGLE/validationES3.h"
 
 using namespace angle;
 
@@ -19,44 +18,13 @@ namespace gl
 
 bool ValidateGetBooleani_v(Context *context, GLenum target, GLuint index, GLboolean *data)
 {
-    if (context->getClientVersion() < ES_3_1)
+    if (!context->getGLVersion().isES31())
     {
         context->handleError(Error(GL_INVALID_OPERATION, "Context does not support GLES3.1"));
         return false;
     }
 
-    if (!ValidateIndexedStateQuery(context, target, index, nullptr))
-    {
-        return false;
-    }
-
-    return true;
-}
-
-bool ValidateGetBooleani_vRobustANGLE(Context *context,
-                                      GLenum target,
-                                      GLuint index,
-                                      GLsizei bufSize,
-                                      GLsizei *length,
-                                      GLboolean *data)
-{
-    if (context->getClientVersion() < ES_3_1)
-    {
-        context->handleError(Error(GL_INVALID_OPERATION, "Context does not support GLES3.1"));
-        return false;
-    }
-
-    if (!ValidateRobustEntryPoint(context, bufSize))
-    {
-        return false;
-    }
-
-    if (!ValidateIndexedStateQuery(context, target, index, length))
-    {
-        return false;
-    }
-
-    if (!ValidateRobustBufferSize(context, bufSize, *length))
+    if (!ValidateIndexedStateQuery(context, target, index))
     {
         return false;
     }