commit df836ff8f17d31daae08660b4f2aa15a6edfbc8b
author Jamie Madill <jmadill@chromium.org> Mon Oct 01 10:36:24 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Tue Oct 02 17:36:46 2018 +0000
tree bb9198091b4b19d6ef6bfe7b9dea08a7da0b9bee
parent 0da73fedd90022e1dd9d4611e44e6307eeedaa13

Call onProgramExecutableChange in useProgram.

This cleans up the code slightly and removes a few if checks.
Also fixes a potential edge case with ProgramBinary called on a program
that is in-use.

Bug: angleproject:2763
Change-Id: Ibe0ab20ed44f593bb6c2b0612871680a7df1a15f
Reviewed-on: https://chromium-review.googlesource.com/1254041
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@google.com>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/Context.cpp

diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp
index 68fa842..374e174 100644
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -5715,8 +5715,11 @@
     //      ProgramD3D.
     if (programObject->isInUse())
     {
-        // isLinked() which forces to resolve linking, will be called.
-        mGLState.onProgramExecutableChange(programObject);
+        if (programObject->isLinked())
+        {
+            mGLState.onProgramExecutableChange(programObject);
+        }
+
         mStateCache.onProgramExecutableChange(this);
     }
 }
@@ -5927,10 +5930,10 @@
     ASSERT(programObject != nullptr);
 
     handleError(programObject->loadBinary(this, binaryFormat, binary, length));
-    mStateCache.onProgramExecutableChange(this);
     if (programObject->isInUse())
     {
-        mGLState.setObjectDirty(GL_PROGRAM);
+        mGLState.onProgramExecutableChange(programObject);
+        mStateCache.onProgramExecutableChange(this);
     }
 }