Add workaround to always call useProgram after a successful link.

src/libANGLE/renderer/gl/ProgramGL.cpp

@@ -13,6 +13,7 @@
 #include "libANGLE/renderer/gl/FunctionsGL.h"
 #include "libANGLE/renderer/gl/ShaderGL.h"
 #include "libANGLE/renderer/gl/StateManagerGL.h"
+#include "libANGLE/renderer/gl/WorkaroundsGL.h"
 #include "platform/Platform.h"
 
 namespace rx
@@ -20,8 +21,13 @@ namespace rx
 
 ProgramGL::ProgramGL(const gl::Program::Data &data,
                      const FunctionsGL *functions,
+                     const WorkaroundsGL &workarounds,
                      StateManagerGL *stateManager)
-    : ProgramImpl(data), mFunctions(functions), mStateManager(stateManager), mProgramID(0)
+    : ProgramImpl(data),
+      mFunctions(functions),
+      mWorkarounds(workarounds),
+      mStateManager(stateManager),
+      mProgramID(0)
 {
     ASSERT(mFunctions);
     ASSERT(mStateManager);
@@ -144,6 +150,11 @@ LinkResult ProgramGL::link(const gl::Data &data, gl::InfoLog &infoLog)
         return LinkResult(false, gl::Error(GL_NO_ERROR));
     }
 
+    if (mWorkarounds.alwaysCallUseProgramAfterLink)
+    {
+        mStateManager->forceUseProgram(mProgramID);
+    }
+
     // Query the uniform information
     ASSERT(mUniformRealLocationMap.empty());
     const auto &uniforms = mData.getUniforms();

src/libANGLE/renderer/gl/ProgramGL.h

@@ -9,6 +9,7 @@
 #ifndef LIBANGLE_RENDERER_GL_PROGRAMGL_H_
 #define LIBANGLE_RENDERER_GL_PROGRAMGL_H_
 
+#include "libANGLE/renderer/gl/WorkaroundsGL.h"
 #include "libANGLE/renderer/ProgramImpl.h"
 
 namespace rx
@@ -28,6 +29,7 @@ class ProgramGL : public ProgramImpl
   public:
     ProgramGL(const gl::Program::Data &data,
               const FunctionsGL *functions,
+              const WorkaroundsGL &workarounds,
               StateManagerGL *stateManager);
     ~ProgramGL() override;
 
@@ -76,6 +78,7 @@ class ProgramGL : public ProgramImpl
     GLint uniLoc(GLint glLocation) const { return mUniformRealLocationMap[glLocation]; }
 
     const FunctionsGL *mFunctions;
+    const WorkaroundsGL &mWorkarounds;
     StateManagerGL *mStateManager;
 
     std::vector<GLint> mUniformRealLocationMap;

src/libANGLE/renderer/gl/RendererGL.cpp

@@ -271,7 +271,7 @@ ShaderImpl *RendererGL::createShader(const gl::Shader::Data &data)
 
 ProgramImpl *RendererGL::createProgram(const gl::Program::Data &data)
 {
-    return new ProgramGL(data, mFunctions, mStateManager);
+    return new ProgramGL(data, mFunctions, mWorkarounds, mStateManager);
 }
 
 FramebufferImpl *RendererGL::createFramebuffer(const gl::Framebuffer::Data &data)

src/libANGLE/renderer/gl/StateManagerGL.cpp

@@ -302,11 +302,16 @@ void StateManagerGL::useProgram(GLuint program)
 {
     if (mProgram != program)
     {
-        mProgram = program;
-        mFunctions->useProgram(mProgram);
+        forceUseProgram(program);
     }
 }
 
+void StateManagerGL::forceUseProgram(GLuint program)
+{
+    mProgram = program;
+    mFunctions->useProgram(mProgram);
+}
+
 void StateManagerGL::bindVertexArray(GLuint vao, GLuint elementArrayBuffer)
 {
     if (mVAO != vao)

src/libANGLE/renderer/gl/StateManagerGL.h

@@ -47,6 +47,7 @@ class StateManagerGL final : angle::NonCopyable
     void deleteQuery(GLuint query);
 
     void useProgram(GLuint program);
+    void forceUseProgram(GLuint program);
     void bindVertexArray(GLuint vao, GLuint elementArrayBuffer);
     void bindBuffer(GLenum type, GLuint buffer);
     void bindBufferBase(GLenum type, size_t index, GLuint buffer);

src/libANGLE/renderer/gl/WorkaroundsGL.h

@@ -19,7 +19,8 @@ struct WorkaroundsGL
           rgba4IsNotSupportedForColorRendering(false),
           doesSRGBClearsOnLinearFramebufferAttachments(false),
           doWhileGLSLCausesGPUHang(false),
-          finishDoesNotCauseQueriesToBeAvailable(false)
+          finishDoesNotCauseQueriesToBeAvailable(false),
+          alwaysCallUseProgramAfterLink(false)
     {
     }
 
@@ -56,6 +57,12 @@ struct WorkaroundsGL
     // (NVIDIA) drivers.  It was found that enabling GL_DEBUG_OUTPUT_SYNCHRONOUS before the finish
     // causes it to fully finish.
     bool finishDoesNotCauseQueriesToBeAvailable;
+
+    // Always call useProgram after a successful link to avoid a driver bug.
+    // This workaround is meant to reproduce the use_current_program_after_successful_link
+    // workaround in Chromium (http://crbug.com/110263). It has been shown that this workaround is
+    // not necessary for MacOSX 10.9 and higher (http://crrev.com/39eb535b).
+    bool alwaysCallUseProgramAfterLink;
 };
 }
 

src/libANGLE/renderer/gl/renderergl_utils.cpp

@@ -666,6 +666,9 @@ void GenerateWorkarounds(const FunctionsGL *functions, WorkaroundsGL *workaround
 
     workarounds->finishDoesNotCauseQueriesToBeAvailable =
         functions->standard == STANDARD_GL_DESKTOP && vendor == VENDOR_ID_NVIDIA;
+
+    // TODO(cwallez): Disable this workaround for MacOSX versions 10.9 or later.
+    workarounds->alwaysCallUseProgramAfterLink = true;
 }
 
 }