Ensure GLES1 state is cleared on context switch.

src/libANGLE/Context.cpp

@@ -9006,6 +9006,7 @@ void Context::dirtyAllState()
 {
     mState.setAllDirtyBits();
     mState.setAllDirtyObjects();
+    mState.gles1().setAllDirty();
 }
 
 // ErrorSet implementation.

src/libANGLE/GLES1Renderer.cpp

@@ -618,6 +618,14 @@ angle::Result GLES1Renderer::initializeRendererProgram(Context *context, State *
 {
     if (mRendererProgramInitialized)
     {
+        // If we're already done the initialization/compilation, but there has been some
+        // state change, just reload the compiled program.
+        GLES1State &gles1State = glState->gles1();
+        if (gles1State.shouldHandleDirtyProgram())
+        {
+            Program *programObject = getProgram(mProgramState.program);
+            ANGLE_TRY(glState->setProgram(context, programObject));
+        }
         return angle::Result::Continue;
     }
 

src/libANGLE/GLES1State.cpp

@@ -219,6 +219,13 @@ const angle::Vector3 &GLES1State::getCurrentNormal() const
     return mCurrentNormal;
 }
 
+bool GLES1State::shouldHandleDirtyProgram()
+{
+    bool ret = isDirty(DIRTY_GLES1_PROGRAM);
+    clearDirtyBits(DIRTY_GLES1_PROGRAM);
+    return ret;
+}
+
 void GLES1State::setCurrentTextureCoords(unsigned int unit, const TextureCoordF &coords)
 {
     setDirty(DIRTY_GLES1_CURRENT_VECTOR);
@@ -565,24 +572,4 @@ GLenum GLES1State::getHint(GLenum target) const
     }
 }
 
-void GLES1State::setDirty(DirtyGles1Type type)
-{
-    mDirtyBits.set(type);
-}
-
-void GLES1State::setAllDirty()
-{
-    mDirtyBits.set();
-}
-
-void GLES1State::clearDirty()
-{
-    mDirtyBits.reset();
-}
-
-bool GLES1State::isDirty(DirtyGles1Type type) const
-{
-    return mDirtyBits.test(type);
-}
-
 }  // namespace gl

src/libANGLE/GLES1State.h

@@ -218,16 +218,11 @@ class GLES1State final : angle::NonCopyable
     AttributesMask getVertexArraysAttributeMask() const;
     AttributesMask getActiveAttributesMask() const;
 
+    bool shouldHandleDirtyProgram();
+
     void setHint(GLenum target, GLenum mode);
     GLenum getHint(GLenum target) const;
 
-  private:
-    friend class State;
-    friend class GLES1Renderer;
-
-    // Back pointer for reading from State.
-    const State *mGLState;
-
     enum DirtyGles1Type
     {
         DIRTY_GLES1_TEXTURE_UNIT_ENABLE = 0,
@@ -246,15 +241,26 @@ class GLES1State final : angle::NonCopyable
         DIRTY_GLES1_LOGIC_OP,
         DIRTY_GLES1_CLIP_PLANES,
         DIRTY_GLES1_HINT_SETTING,
+        DIRTY_GLES1_PROGRAM,
         DIRTY_GLES1_MAX,
     };
+
+    void setAllDirty() { mDirtyBits.set(); }
+
+  private:
+    friend class State;
+    friend class GLES1Renderer;
+
+    // Back pointer for reading from State.
+    const State *mGLState;
+
     using DirtyBits = angle::BitSet<DIRTY_GLES1_MAX>;
     DirtyBits mDirtyBits;
 
-    void setDirty(DirtyGles1Type type);
-    void setAllDirty();
-    void clearDirty();
-    bool isDirty(DirtyGles1Type type) const;
+    void setDirty(DirtyGles1Type type) { mDirtyBits.set(type); }
+    void clearDirty() { mDirtyBits.reset(); }
+    void clearDirtyBits(const DirtyGles1Type &bitset) { mDirtyBits &= ~bitset; }
+    bool isDirty(DirtyGles1Type type) const { return mDirtyBits.test(type); }
 
     // All initial state values come from the
     // OpenGL ES 1.1 spec.