commit 785e8a0b7db3de4330b3682c8a2b5183ed73fdee
author Jamie Madill <jmadill@chromium.org> Thu Oct 04 17:42:00 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Fri Oct 05 11:14:22 2018 +0000
tree b866e7a89e24f37e6b3b4c78e6f5cda5da829219
parent 0ca09753392d43fb30f689a2f037b609c49472c8

Remove gl::LinkResult.

Instead of returning a small struct from LinkProgram calls we use
angle::Result. Linking can have 3 cases:

- the link was successful -> angle::Result::Continue
- the link failed -> angle::Result::Incomplete
- there was an internal error -> angle::Result::Stop

Note that any unexpected Incomplete is still an error. Each function
that accepts Incomplete must check explicitly.

This is the last user of ErrorOrResult.

Bug: angleproject:2491
Change-Id: Idba23be27efe4b561720a4bdd8fe486b40779497
Reviewed-on: https://chromium-review.googlesource.com/c/1255645
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@google.com>

src/libANGLE/validationES.cpp

diff --git a/src/libANGLE/validationES.cpp b/src/libANGLE/validationES.cpp
index 2a0b4a2..d7b6956 100644
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -385,7 +385,7 @@
 
 bool ValidateFragmentShaderColorBufferTypeMatch(Context *context)
 {
-    const Program *program         = context->getGLState().getLinkedProgram();
+    const Program *program         = context->getGLState().getLinkedProgram(context);
     const Framebuffer *framebuffer = context->getGLState().getDrawFramebuffer();
 
     return ComponentTypeMask::Validate(program->getDrawBufferTypeMask().to_ulong(),
@@ -397,7 +397,7 @@
 bool ValidateVertexShaderAttributeTypeMatch(Context *context)
 {
     const auto &glState    = context->getGLState();
-    const Program *program = context->getGLState().getLinkedProgram();
+    const Program *program = context->getGLState().getLinkedProgram(context);
     const VertexArray *vao = context->getGLState().getVertexArray();
 
     unsigned long stateCurrentValuesTypeBits = glState.getCurrentValuesTypeMask().to_ulong();
@@ -655,7 +655,7 @@
     // Verify there is at least one active attribute with a divisor of zero
     const State &state = context->getGLState();
 
-    Program *program = state.getLinkedProgram();
+    Program *program = state.getLinkedProgram(context);
 
     const auto &attribs  = state.getVertexArray()->getVertexAttributes();
     const auto &bindings = state.getVertexArray()->getVertexBindings();
@@ -1040,7 +1040,7 @@
     Program *program = GetValidProgramNoResolve(context, id);
     if (program)
     {
-        program->resolveLink();
+        program->resolveLink(context);
     }
     return program;
 }
@@ -2150,7 +2150,7 @@
 bool ValidateUniform(Context *context, GLenum valueType, GLint location, GLsizei count)
 {
     const LinkedUniform *uniform = nullptr;
-    Program *programObject       = context->getGLState().getLinkedProgram();
+    Program *programObject       = context->getGLState().getLinkedProgram(context);
     return ValidateUniformCommonBase(context, programObject, location, count, &uniform) &&
            ValidateUniformValue(context, valueType, uniform->type);
 }
@@ -2158,7 +2158,7 @@
 bool ValidateUniform1iv(Context *context, GLint location, GLsizei count, const GLint *value)
 {
     const LinkedUniform *uniform = nullptr;
-    Program *programObject       = context->getGLState().getLinkedProgram();
+    Program *programObject       = context->getGLState().getLinkedProgram(context);
     return ValidateUniformCommonBase(context, programObject, location, count, &uniform) &&
            ValidateUniform1ivValue(context, uniform->type, count, value);
 }
@@ -2176,7 +2176,7 @@
     }
 
     const LinkedUniform *uniform = nullptr;
-    Program *programObject       = context->getGLState().getLinkedProgram();
+    Program *programObject       = context->getGLState().getLinkedProgram(context);
     return ValidateUniformCommonBase(context, programObject, location, count, &uniform) &&
            ValidateUniformMatrixValue(context, valueType, uniform->type);
 }
@@ -2657,7 +2657,7 @@
     // If we are running GLES1, there is no current program.
     if (context->getClientVersion() >= Version(2, 0))
     {
-        Program *program = state.getLinkedProgram();
+        Program *program = state.getLinkedProgram(context);
         if (!program)
         {
             return kErrorProgramNotBound;
@@ -2804,7 +2804,7 @@
     {
         const State &state = context->getGLState();
 
-        Program *program = state.getLinkedProgram();
+        Program *program = state.getLinkedProgram(context);
         ASSERT(program);
 
         // Do geometry shader specific validations