Inline ValidateBindBuffer.

src/libANGLE/Context.cpp

@@ -2628,6 +2628,11 @@ void Context::handleError(GLenum errorCode,
     mErrors.handleError(errorCode, message, file, function, line);
 }
 
+void Context::validationError(GLenum errorCode, const char *message)
+{
+    mErrors.validationError(errorCode, message);
+}
+
 // Get one of the recorded errors and clear its flag, if any.
 // [OpenGL ES 2.0.24] section 2.5 page 13.
 GLenum Context::getError()
@@ -7977,6 +7982,11 @@ void ErrorSet::handleError(GLenum errorCode,
     handleError(gl::Error(errorCode, errorCode, errorStream.str()));
 }
 
+void ErrorSet::validationError(GLenum errorCode, const char *message)
+{
+    handleError(gl::Error(errorCode, message));
+}
+
 bool ErrorSet::empty() const
 {
     return mErrors.empty();

src/libANGLE/Context.h

@@ -81,6 +81,8 @@ class ErrorSet : angle::NonCopyable
                      const char *function,
                      unsigned int line);
 
+    void validationError(GLenum errorCode, const char *message);
+
   private:
     Context *mContext;
 
@@ -1576,6 +1578,8 @@ class Context final : public egl::LabeledObject, angle::NonCopyable, public angl
                      const char *function,
                      unsigned int line);
 
+    void validationError(GLenum errorCode, const char *message);
+
     GLenum getError();
     void markContextLost();
 
@@ -1655,7 +1659,7 @@ class Context final : public egl::LabeledObject, angle::NonCopyable, public angl
         return mState.mTextures->isHandleGenerated(texture);
     }
 
-    bool isBufferGenerated(GLuint buffer) const
+    ANGLE_INLINE bool isBufferGenerated(GLuint buffer) const
     {
         return mState.mBuffers->isHandleGenerated(buffer);
     }

src/libANGLE/validationES2.cpp

@@ -4512,36 +4512,18 @@ bool ValidateBindAttribLocation(Context *context, GLuint program, GLuint index,
     return GetValidProgram(context, program) != nullptr;
 }
 
-bool ValidateBindBuffer(Context *context, BufferBinding target, GLuint buffer)
-{
-    if (!context->isValidBufferBinding(target))
-    {
-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidBufferTypes);
-        return false;
-    }
-
-    if (!context->getGLState().isBindGeneratesResourceEnabled() &&
-        !context->isBufferGenerated(buffer))
-    {
-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ObjectNotGenerated);
-        return false;
-    }
-
-    return true;
-}
-
 bool ValidateBindFramebuffer(Context *context, GLenum target, GLuint framebuffer)
 {
     if (!ValidFramebufferTarget(context, target))
     {
-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidFramebufferTarget);
+        context->validationError(GL_INVALID_ENUM, kErrorInvalidFramebufferTarget);
         return false;
     }
 
     if (!context->getGLState().isBindGeneratesResourceEnabled() &&
         !context->isFramebufferGenerated(framebuffer))
     {
-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ObjectNotGenerated);
+        context->validationError(GL_INVALID_OPERATION, kErrorObjectNotGenerated);
         return false;
     }
 

src/libANGLE/validationES2.h

@@ -722,11 +722,34 @@ bool ValidateTexStorage3DEXT(Context *context,
                              GLsizei height,
                              GLsizei depth);
 bool ValidateMaxShaderCompilerThreadsKHR(Context *context, GLuint count);
+}  // namespace gl
+
+#include "libANGLE/ErrorStrings.h"
 
+namespace gl
+{
 ANGLE_INLINE bool ValidateUniform2f(Context *context, GLint location, GLfloat x, GLfloat y)
 {
     return ValidateUniform(context, GL_FLOAT_VEC2, location, 1);
 }
+
+ANGLE_INLINE bool ValidateBindBuffer(Context *context, BufferBinding target, GLuint buffer)
+{
+    if (!context->isValidBufferBinding(target))
+    {
+        context->validationError(GL_INVALID_ENUM, kErrorInvalidBufferTypes);
+        return false;
+    }
+
+    if (!context->getGLState().isBindGeneratesResourceEnabled() &&
+        !context->isBufferGenerated(buffer))
+    {
+        context->validationError(GL_INVALID_OPERATION, kErrorObjectNotGenerated);
+        return false;
+    }
+
+    return true;
+}
 }  // namespace gl
 
 #endif  // LIBANGLE_VALIDATION_ES2_H_