From 4f2ecd53a9daaf88bb7d075745eefb6e2e4741e0 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Wed, 11 Jul 2018 18:11:13 +0200
Subject: Roll back to ANGLE/2845

---
 gfx/angle/src/libANGLE/validationES3.h | 67 +++++-----------------------------
 1 file changed, 9 insertions(+), 58 deletions(-)

(limited to 'gfx/angle/src/libANGLE/validationES3.h')

diff --git a/gfx/angle/src/libANGLE/validationES3.h b/gfx/angle/src/libANGLE/validationES3.h
index ba98c998a..eeef800a8 100755
--- a/gfx/angle/src/libANGLE/validationES3.h
+++ b/gfx/angle/src/libANGLE/validationES3.h
@@ -32,7 +32,6 @@ bool ValidateES3TexImageParametersBase(ValidationContext *context,
                                        GLint border,
                                        GLenum format,
                                        GLenum type,
-                                       GLsizei imageSize,
                                        const GLvoid *pixels);
 
 bool ValidateES3TexStorageParameters(Context *context,
@@ -58,7 +57,6 @@ bool ValidateES3TexImage2DParameters(Context *context,
                                      GLint border,
                                      GLenum format,
                                      GLenum type,
-                                     GLsizei imageSize,
                                      const GLvoid *pixels);
 
 bool ValidateES3TexImage3DParameters(Context *context,
@@ -76,7 +74,6 @@ bool ValidateES3TexImage3DParameters(Context *context,
                                      GLint border,
                                      GLenum format,
                                      GLenum type,
-                                     GLsizei bufSize,
                                      const GLvoid *pixels);
 
 bool ValidateES3CopyTexImageParametersBase(ValidationContext *context,
@@ -156,6 +153,11 @@ bool ValidateGetQueryObjectuiv(Context *context, GLuint id, GLenum pname, GLuint
 bool ValidateFramebufferTextureLayer(Context *context, GLenum target, GLenum attachment,
                                      GLuint texture, GLint level, GLint layer);
 
+bool ValidES3ReadFormatType(ValidationContext *context,
+                            GLenum internalFormat,
+                            GLenum format,
+                            GLenum type);
+
 bool ValidateES3RenderbufferStorageParameters(Context *context, GLenum target, GLsizei samples,
                                               GLenum internalformat, GLsizei width, GLsizei height);
 
@@ -253,18 +255,6 @@ bool ValidateTexImage3D(Context *context,
                         GLenum format,
                         GLenum type,
                         const GLvoid *pixels);
-bool ValidateTexImage3DRobustANGLE(Context *context,
-                                   GLenum target,
-                                   GLint level,
-                                   GLint internalformat,
-                                   GLsizei width,
-                                   GLsizei height,
-                                   GLsizei depth,
-                                   GLint border,
-                                   GLenum format,
-                                   GLenum type,
-                                   GLsizei bufSize,
-                                   const GLvoid *pixels);
 bool ValidateTexSubImage3D(Context *context,
                            GLenum target,
                            GLint level,
@@ -277,19 +267,6 @@ bool ValidateTexSubImage3D(Context *context,
                            GLenum format,
                            GLenum type,
                            const GLvoid *pixels);
-bool ValidateTexSubImage3DRobustANGLE(Context *context,
-                                      GLenum target,
-                                      GLint level,
-                                      GLint xoffset,
-                                      GLint yoffset,
-                                      GLint zoffset,
-                                      GLsizei width,
-                                      GLsizei height,
-                                      GLsizei depth,
-                                      GLenum format,
-                                      GLenum type,
-                                      GLsizei bufSize,
-                                      const GLvoid *pixels);
 bool ValidateCompressedTexSubImage3D(Context *context,
                                      GLenum target,
                                      GLint level,
@@ -317,13 +294,10 @@ bool ValidateGenOrDeleteCountES3(Context *context, GLint count);
 
 bool ValidateBeginTransformFeedback(Context *context, GLenum primitiveMode);
 
+bool ValidateSamplerParameteri(Context *context, GLuint sampler, GLenum pname, GLint param);
+bool ValidateSamplerParameterf(Context *context, GLuint sampler, GLenum pname, GLfloat param);
+
 bool ValidateGetBufferPointerv(Context *context, GLenum target, GLenum pname, GLvoid **params);
-bool ValidateGetBufferPointervRobustANGLE(Context *context,
-                                          GLenum target,
-                                          GLenum pname,
-                                          GLsizei bufSize,
-                                          GLsizei *length,
-                                          GLvoid **params);
 bool ValidateUnmapBuffer(Context *context, GLenum target);
 bool ValidateMapBufferRange(Context *context,
                             GLenum target,
@@ -335,35 +309,12 @@ bool ValidateFlushMappedBufferRange(Context *context,
                                     GLintptr offset,
                                     GLsizeiptr length);
 
-bool ValidateIndexedStateQuery(ValidationContext *context,
-                               GLenum pname,
-                               GLuint index,
-                               GLsizei *length);
+bool ValidateIndexedStateQuery(ValidationContext *context, GLenum pname, GLuint index);
 bool ValidateGetIntegeri_v(ValidationContext *context, GLenum target, GLuint index, GLint *data);
-bool ValidateGetIntegeri_vRobustANGLE(ValidationContext *context,
-                                      GLenum target,
-                                      GLuint index,
-                                      GLsizei bufSize,
-                                      GLsizei *length,
-                                      GLint *data);
 bool ValidateGetInteger64i_v(ValidationContext *context,
                              GLenum target,
                              GLuint index,
                              GLint64 *data);
-bool ValidateGetInteger64i_vRobustANGLE(ValidationContext *context,
-                                        GLenum target,
-                                        GLuint index,
-                                        GLsizei bufSize,
-                                        GLsizei *length,
-                                        GLint64 *data);
-
-bool ValidateCopyBufferSubData(ValidationContext *context,
-                               GLenum readTarget,
-                               GLenum writeTarget,
-                               GLintptr readOffset,
-                               GLintptr writeOffset,
-                               GLsizeiptr size);
-
 }  // namespace gl
 
 #endif // LIBANGLE_VALIDATION_ES3_H_
-- 
cgit v1.2.3