commit 9d0bb3d4d5c012d3b68bbf47adc910e66009bd5c
author Jamie Madill <jmadill@chromium.org> Tue Oct 09 20:29:13 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Wed Oct 10 03:42:29 2018 +0000
tree af9a9d73584f3066715e7c74ed244170372d6d8c
parent 3209937075cbeb4037b8ae52a0939764b4b6f2ea

Pass bit mask to ContextImpl::syncState.

This can be used to mask out inappropriate local dirty bits.

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

src/libANGLE/Context.cpp

diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp
index 3150452..c0b8a8b 100644
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -483,6 +483,8 @@
     }
 
     // Initialize dirty bit masks
+    mAllDirtyBits.set();
+
     mDrawDirtyObjects.set(State::DIRTY_OBJECT_DRAW_FRAMEBUFFER);
     mDrawDirtyObjects.set(State::DIRTY_OBJECT_VERTEX_ARRAY);
     mDrawDirtyObjects.set(State::DIRTY_OBJECT_PROGRAM_TEXTURES);
@@ -3503,7 +3505,7 @@
 angle::Result Context::syncDirtyBits()
 {
     const State::DirtyBits &dirtyBits = mGLState.getDirtyBits();
-    ANGLE_TRY(mImplementation->syncState(this, dirtyBits));
+    ANGLE_TRY(mImplementation->syncState(this, dirtyBits, mAllDirtyBits));
     mGLState.clearDirtyBits();
     return angle::Result::Continue();
 }
@@ -3511,7 +3513,7 @@
 angle::Result Context::syncDirtyBits(const State::DirtyBits &bitMask)
 {
     const State::DirtyBits &dirtyBits = (mGLState.getDirtyBits() & bitMask);
-    ANGLE_TRY(mImplementation->syncState(this, dirtyBits));
+    ANGLE_TRY(mImplementation->syncState(this, dirtyBits, bitMask));
     mGLState.clearDirtyBits(dirtyBits);
     return angle::Result::Continue();
 }