Refactor remaining GLES 2.0 entry points.

src/libANGLE/Context.h

@@ -237,8 +237,11 @@ class Context final : public ValidationContext
     bool isTransformFeedbackGenerated(GLuint vertexArray);
 
     void getBooleanv(GLenum pname, GLboolean *params);
+    void getBooleanvImpl(GLenum pname, GLboolean *params);
     void getFloatv(GLenum pname, GLfloat *params);
+    void getFloatvImpl(GLenum pname, GLfloat *params);
     void getIntegerv(GLenum pname, GLint *params);
+    void getIntegervImpl(GLenum pname, GLint *params);
     void getInteger64v(GLenum pname, GLint64 *params);
     void getPointerv(GLenum pname, void **params) const;
     void getBooleani_v(GLenum target, GLuint index, GLboolean *data);
@@ -669,6 +672,87 @@ class Context final : public ValidationContext
                            GLintptr writeOffset,
                            GLsizeiptr size);
 
+    GLenum checkFramebufferStatus(GLenum target);
+    void compileShader(GLuint shader);
+    void deleteBuffers(GLsizei n, const GLuint *buffers);
+    void deleteFramebuffers(GLsizei n, const GLuint *framebuffers);
+    void deleteRenderbuffers(GLsizei n, const GLuint *renderbuffers);
+    void deleteTextures(GLsizei n, const GLuint *textures);
+    void detachShader(GLuint program, GLuint shader);
+    void genBuffers(GLsizei n, GLuint *buffers);
+    void genFramebuffers(GLsizei n, GLuint *framebuffers);
+    void genRenderbuffers(GLsizei n, GLuint *renderbuffers);
+    void genTextures(GLsizei n, GLuint *textures);
+    void getActiveAttrib(GLuint program,
+                         GLuint index,
+                         GLsizei bufsize,
+                         GLsizei *length,
+                         GLint *size,
+                         GLenum *type,
+                         GLchar *name);
+    void getActiveUniform(GLuint program,
+                          GLuint index,
+                          GLsizei bufsize,
+                          GLsizei *length,
+                          GLint *size,
+                          GLenum *type,
+                          GLchar *name);
+    void getAttachedShaders(GLuint program, GLsizei maxcount, GLsizei *count, GLuint *shaders);
+    GLint getAttribLocation(GLuint program, const GLchar *name);
+    void getProgramiv(GLuint program, GLenum pname, GLint *params);
+    void getInfoLog(GLuint program, GLsizei bufsize, GLsizei *length, GLchar *infolog);
+    void getShaderiv(GLuint shader, GLenum pname, GLint *params);
+    void getShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *infolog);
+    void getShaderPrecisionFormat(GLenum shadertype,
+                                  GLenum precisiontype,
+                                  GLint *range,
+                                  GLint *precision);
+    void getShaderSource(GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source);
+    void getUniformfv(GLuint program, GLint location, GLfloat *params);
+    void getUniformiv(GLuint program, GLint location, GLint *params);
+    GLint getUniformLocation(GLuint program, const GLchar *name);
+    GLboolean isBuffer(GLuint buffer);
+    GLboolean isEnabled(GLenum cap);
+    GLboolean isFramebuffer(GLuint framebuffer);
+    GLboolean isProgram(GLuint program);
+    GLboolean isRenderbuffer(GLuint renderbuffer);
+    GLboolean isShader(GLuint shader);
+    GLboolean isTexture(GLuint texture);
+    void linkProgram(GLuint program);
+    void releaseShaderCompiler();
+    void shaderBinary(GLsizei n,
+                      const GLuint *shaders,
+                      GLenum binaryformat,
+                      const GLvoid *binary,
+                      GLsizei length);
+    void shaderSource(GLuint shader,
+                      GLsizei count,
+                      const GLchar *const *string,
+                      const GLint *length);
+    void stencilFunc(GLenum func, GLint ref, GLuint mask);
+    void stencilMask(GLuint mask);
+    void stencilOp(GLenum fail, GLenum zfail, GLenum zpass);
+    void uniform1f(GLint location, GLfloat x);
+    void uniform1fv(GLint location, GLsizei count, const GLfloat *v);
+    void uniform1i(GLint location, GLint x);
+    void uniform1iv(GLint location, GLsizei count, const GLint *v);
+    void uniform2f(GLint location, GLfloat x, GLfloat y);
+    void uniform2fv(GLint location, GLsizei count, const GLfloat *v);
+    void uniform2i(GLint location, GLint x, GLint y);
+    void uniform2iv(GLint location, GLsizei count, const GLint *v);
+    void uniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z);
+    void uniform3fv(GLint location, GLsizei count, const GLfloat *v);
+    void uniform3i(GLint location, GLint x, GLint y, GLint z);
+    void uniform3iv(GLint location, GLsizei count, const GLint *v);
+    void uniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+    void uniform4fv(GLint location, GLsizei count, const GLfloat *v);
+    void uniform4i(GLint location, GLint x, GLint y, GLint z, GLint w);
+    void uniform4iv(GLint location, GLsizei count, const GLint *v);
+    void uniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+    void uniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+    void uniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+    void validateProgram(GLuint program);
+
     void handleError(const Error &error) override;
 
     GLenum getError();

src/libANGLE/Program.cpp

@@ -490,39 +490,27 @@ void Program::attachShader(Shader *shader)
     }
 }
 
-bool Program::detachShader(const Context *context, Shader *shader)
+void Program::detachShader(const Context *context, Shader *shader)
 {
     switch (shader->getType())
     {
         case GL_VERTEX_SHADER:
         {
-            if (mState.mAttachedVertexShader != shader)
-            {
-                return false;
-            }
-
+            ASSERT(mState.mAttachedVertexShader == shader);
             shader->release(context);
             mState.mAttachedVertexShader = nullptr;
             break;
         }
         case GL_FRAGMENT_SHADER:
         {
-            if (mState.mAttachedFragmentShader != shader)
-            {
-                return false;
-            }
-
+            ASSERT(mState.mAttachedFragmentShader == shader);
             shader->release(context);
             mState.mAttachedFragmentShader = nullptr;
             break;
         }
         case GL_COMPUTE_SHADER:
         {
-            if (mState.mAttachedComputeShader != shader)
-            {
-                return false;
-            }
-
+            ASSERT(mState.mAttachedComputeShader == shader);
             shader->release(context);
             mState.mAttachedComputeShader = nullptr;
             break;
@@ -530,8 +518,6 @@ bool Program::detachShader(const Context *context, Shader *shader)
         default:
             UNREACHABLE();
     }
-
-    return true;
 }
 
 int Program::getAttachedShadersCount() const

src/libANGLE/Program.h

@@ -298,7 +298,7 @@ class Program final : angle::NonCopyable, public LabeledObject
     rx::ProgramImpl *getImplementation() const { return mProgram; }
 
     void attachShader(Shader *shader);
-    bool detachShader(const Context *context, Shader *shader);
+    void detachShader(const Context *context, Shader *shader);
     int getAttachedShadersCount() const;
 
     const Shader *getAttachedVertexShader() const { return mState.mAttachedVertexShader; }

src/libANGLE/queryconversions.cpp

@@ -93,7 +93,7 @@ void CastStateValues(Context *context, GLenum nativeType, GLenum pname,
     if (nativeType == GL_INT)
     {
         std::vector<GLint> intParams(numParams, 0);
-        context->getIntegerv(pname, intParams.data());
+        context->getIntegervImpl(pname, intParams.data());
 
         for (unsigned int i = 0; i < numParams; ++i)
         {
@@ -103,7 +103,7 @@ void CastStateValues(Context *context, GLenum nativeType, GLenum pname,
     else if (nativeType == GL_BOOL)
     {
         std::vector<GLboolean> boolParams(numParams, GL_FALSE);
-        context->getBooleanv(pname, boolParams.data());
+        context->getBooleanvImpl(pname, boolParams.data());
 
         for (unsigned int i = 0; i < numParams; ++i)
         {
@@ -113,7 +113,7 @@ void CastStateValues(Context *context, GLenum nativeType, GLenum pname,
     else if (nativeType == GL_FLOAT)
     {
         std::vector<GLfloat> floatParams(numParams, 0.0f);
-        context->getFloatv(pname, floatParams.data());
+        context->getFloatvImpl(pname, floatParams.data());
 
         for (unsigned int i = 0; i < numParams; ++i)
         {

src/libANGLE/validationES.h

@@ -214,9 +214,9 @@ bool ValidateProgramUniformMatrix(Context *context,
                                   GLsizei count,
                                   GLboolean transpose);
 
-bool ValidateUniform(Context *context, GLenum uniformType, GLint location, GLsizei count);
+bool ValidateUniform(ValidationContext *context, GLenum uniformType, GLint location, GLsizei count);
 bool ValidateUniform1iv(Context *context, GLint location, GLsizei count, const GLint *value);
-bool ValidateUniformMatrix(Context *context,
+bool ValidateUniformMatrix(ValidationContext *context,
                            GLenum matrixType,
                            GLint location,
                            GLsizei count,
@@ -249,7 +249,7 @@ bool ValidateCopyTexImageParametersBase(ValidationContext *context,
                                         Format *textureFormatOut);
 
 bool ValidateDrawBase(ValidationContext *context, GLenum mode, GLsizei count);
-bool ValidateDrawArrays(ValidationContext *context,
+bool ValidateDrawArraysCommon(ValidationContext *context,
                               GLenum mode,
                               GLint first,
                               GLsizei count,

src/libGLESv2/entry_points_gles_2_0_ext.cpp

@@ -1982,15 +1982,7 @@ ANGLE_EXPORT void GL_APIENTRY GetBooleanvRobustANGLE(GLenum pname,
             return;
         }
 
-        if (nativeType == GL_BOOL)
-        {
         context->getBooleanv(pname, params);
-        }
-        else
-        {
-            CastStateValues(context, nativeType, pname, numParams, params);
-        }
-
         SetRobustLengthParam(length, numParams);
     }
 }
@@ -2040,15 +2032,7 @@ ANGLE_EXPORT void GL_APIENTRY GetFloatvRobustANGLE(GLenum pname,
             return;
         }
 
-        if (nativeType == GL_FLOAT)
-        {
         context->getFloatv(pname, params);
-        }
-        else
-        {
-            CastStateValues(context, nativeType, pname, numParams, params);
-        }
-
         SetRobustLengthParam(length, numParams);
     }
 }
@@ -2101,14 +2085,7 @@ ANGLE_EXPORT void GL_APIENTRY GetIntegervRobustANGLE(GLenum pname,
             return;
         }
 
-        if (nativeType == GL_INT)
-        {
         context->getIntegerv(pname, data);
-        }
-        else
-        {
-            CastStateValues(context, nativeType, pname, numParams, data);
-        }
         SetRobustLengthParam(length, numParams);
     }
 }

src/tests/gl_tests/StateChangeTest.cpp

@@ -500,6 +500,9 @@ TEST_P(StateChangeRenderTest, RecreateTexture)
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mTextures[0], 0);
 
+    // Explictly check FBO status sync in some versions of ANGLE no_error skips FBO checks.
+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
+
     // Draw with red to the FBO.
     GLColor red(255, 0, 0, 255);
     setUniformColor(red);
@@ -513,6 +516,9 @@ TEST_P(StateChangeRenderTest, RecreateTexture)
                  greenPixels.data());
     EXPECT_PIXEL_COLOR_EQ(0, 0, green);
 
+    // Explictly check FBO status sync in some versions of ANGLE no_error skips FBO checks.
+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
+
     // Verify drawing blue gives blue. This covers the FBO sync with D3D dirty bits.
     GLColor blue(0, 0, 255, 255);
     setUniformColor(blue);
@@ -531,6 +537,9 @@ TEST_P(StateChangeRenderTest, RecreateRenderbuffer)
     glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, 16, 16);
     glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, mRenderbuffer);
 
+    // Explictly check FBO status sync in some versions of ANGLE no_error skips FBO checks.
+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
+
     // Draw with red to the FBO.
     GLColor red(255, 0, 0, 255);
     setUniformColor(red);
@@ -544,6 +553,9 @@ TEST_P(StateChangeRenderTest, RecreateRenderbuffer)
     GLColor green(0, 255, 0, 255);
     EXPECT_PIXEL_COLOR_EQ(0, 0, green);
 
+    // Explictly check FBO status sync in some versions of ANGLE no_error skips FBO checks.
+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
+
     // Verify drawing blue gives blue. This covers the FBO sync with D3D dirty bits.
     GLColor blue(0, 0, 255, 255);
     setUniformColor(blue);
@@ -564,6 +576,9 @@ TEST_P(StateChangeRenderTest, GenerateMipmap)
     glTexImage2D(GL_TEXTURE_2D, 2, GL_RGBA, 4, 4, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mTextures[0], 0);
 
+    // Explictly check FBO status sync in some versions of ANGLE no_error skips FBO checks.
+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
+
     // Draw once to set the RenderTarget in D3D11
     GLColor red(255, 0, 0, 255);
     setUniformColor(red);
@@ -573,6 +588,9 @@ TEST_P(StateChangeRenderTest, GenerateMipmap)
     // This will trigger the texture to be re-created on FL9_3.
     glGenerateMipmap(GL_TEXTURE_2D);
 
+    // Explictly check FBO status sync in some versions of ANGLE no_error skips FBO checks.
+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
+
     // Now ensure we don't have a stale render target.
     GLColor blue(0, 0, 255, 255);
     setUniformColor(blue);