Merge branch 'master' into js-modules

1 files changed, 12 insertions, 1 deletions

diff --git a/gfx/angle/src/libANGLE/renderer/ProgramImpl.h b/gfx/angle/src/libANGLE/renderer/ProgramImpl.h
index 065f6a338..e62623a8d 100755
--- a/gfx/angle/src/libANGLE/renderer/ProgramImpl.h
+++ b/gfx/angle/src/libANGLE/renderer/ProgramImpl.h
@@ -24,7 +24,14 @@ struct BlockMemberInfo;
 
 namespace rx
 {
-using LinkResult = gl::ErrorOrResult<bool>;
+
+struct LinkResult
+{
+    LinkResult(bool linkSuccess, const gl::Error &error) : linkSuccess(linkSuccess), error(error) {}
+
+    bool linkSuccess;
+    gl::Error error;
+};
 
 class ProgramImpl : angle::NonCopyable
 {
@@ -79,6 +86,10 @@ class ProgramImpl : angle::NonCopyable
                                          GLint components,
                                          const GLfloat *coeffs) = 0;
 
+    virtual void assignUniformBlockRegisters()
+    {
+    }
+
   protected:
     const gl::ProgramState &mState;
 };