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/renderer/null/ContextNULL.cpp

diff --git a/src/libANGLE/renderer/null/ContextNULL.cpp b/src/libANGLE/renderer/null/ContextNULL.cpp
index db73ce8..cb8e1ff 100644
--- a/src/libANGLE/renderer/null/ContextNULL.cpp
+++ b/src/libANGLE/renderer/null/ContextNULL.cpp
@@ -297,7 +297,8 @@
 }
 
 angle::Result ContextNULL::syncState(const gl::Context *context,
-                                     const gl::State::DirtyBits &dirtyBits)
+                                     const gl::State::DirtyBits &dirtyBits,
+                                     const gl::State::DirtyBits &bitMask)
 {
     return angle::Result::Continue();
 }

src/libANGLE/renderer/null/ContextNULL.h

diff --git a/src/libANGLE/renderer/null/ContextNULL.h b/src/libANGLE/renderer/null/ContextNULL.h
index 6fa16b0..734dcae 100644
--- a/src/libANGLE/renderer/null/ContextNULL.h
+++ b/src/libANGLE/renderer/null/ContextNULL.h
@@ -143,7 +143,8 @@
 
     // State sync with dirty bits.
     angle::Result syncState(const gl::Context *context,
-                            const gl::State::DirtyBits &dirtyBits) override;
+                            const gl::State::DirtyBits &dirtyBits,
+                            const gl::State::DirtyBits &bitMask) override;
 
     // Disjoint timer queries
     GLint getGPUDisjoint() override;