Fix D3D9 context state sync.

Calling eglMakeCurrent between different D3D9 contexts could lead to state sync bugs. This fixes the problem by ensuring all internal state is dirtied between makeCurrent calls. This bug turned up when refactoring the tests to run multiple Contexts with the same EGLDisplay. Bug: angleproject:3261 Change-Id: Ic91e1af8b2615e7e7e0d0faabeb533d075ea2e91 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1531534 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>

Fix D3D9 context state sync.
a11db2ac · Jamie Madill · Commit Bot · 6ce1be5a · a11db2ac · a11db2ac
Commit a11db2ac authored Mar 19, 2019 by Jamie Madill Committed by Commit Bot Mar 20, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

Context9.cpp src/libANGLE/renderer/d3d/d3d9/Context9.cpp +1 -0

StateManager9.h src/libANGLE/renderer/d3d/d3d9/StateManager9.h +1 -0

No files found.
--- a/src/libANGLE/renderer/d3d/d3d9/Context9.cpp
+++ b/src/libANGLE/renderer/d3d/d3d9/Context9.cpp
@@ -276,6 +276,7 @@ GLint64 Context9::getTimestamp()

 angle::Result Context9::onMakeCurrent(const gl::Context *context)
 {
+    mRenderer->getStateManager()->setAllDirtyBits();
    return mRenderer->ensureVertexDataManagerInitialized(context);
 }


--- a/src/libANGLE/renderer/d3d/d3d9/StateManager9.h
+++ b/src/libANGLE/renderer/d3d/d3d9/StateManager9.h
@@ -68,6 +68,7 @@ class StateManager9 final : angle::NonCopyable
    int getRenderTargetWidth() const { return mRenderTargetBounds.width; }
    int getRenderTargetHeight() const { return mRenderTargetBounds.height; }

+    void setAllDirtyBits() { mDirtyBits.set(); }
    void resetDirtyBits() { mDirtyBits.reset(); }

  private: