1 files changed, 8 insertions, 5 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d9/StateManager9.h b/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d9/StateManager9.h
index d8c1eb9812..63ce17cb1e 100644
--- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d9/StateManager9.h
+++ b/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d9/StateManager9.h
@@ -10,7 +10,7 @@
 #define LIBANGLE_RENDERER_D3D9_STATEMANAGER9_H_
 
 #include "libANGLE/angletypes.h"
-#include "libANGLE/Data.h"
+#include "libANGLE/ContextState.h"
 #include "libANGLE/State.h"
 #include "libANGLE/renderer/d3d/RendererD3D.h"
 
@@ -39,12 +39,13 @@ class StateManager9 final : angle::NonCopyable
     StateManager9(Renderer9 *renderer9);
     ~StateManager9();
 
+    void initialize();
+
     void syncState(const gl::State &state, const gl::State::DirtyBits &dirtyBits);
 
     gl::Error setBlendDepthRasterStates(const gl::State &glState, unsigned int sampleMask);
     void setScissorState(const gl::Rectangle &scissor, bool enabled);
-    void setViewportState(const gl::Caps *caps,
-                          const gl::Rectangle &viewport,
+    void setViewportState(const gl::Rectangle &viewport,
                           float zNear,
                           float zFar,
                           GLenum drawMode,
@@ -85,7 +86,7 @@ class StateManager9 final : angle::NonCopyable
     void setSampleMask(unsigned int sampleMask);
 
     // Current raster state functions
-    void setCullMode(bool cullFace, GLenum cullMode, GLenum frontFace);
+    void setCullMode(bool cullFace, gl::CullFaceMode cullMode, GLenum frontFace);
     void setDepthBias(bool polygonOffsetFill,
                       GLfloat polygonOffsetFactor,
                       GLfloat polygonOffsetUnits);
@@ -154,7 +155,9 @@ class StateManager9 final : angle::NonCopyable
         DIRTY_BIT_MAX
     };
 
-    typedef std::bitset<DIRTY_BIT_MAX> DirtyBits;
+    using DirtyBits = angle::BitSet<DIRTY_BIT_MAX>;
+
+    bool mUsingZeroColorMaskWorkaround;
 
     // Currently applied blend state
     gl::BlendState mCurBlendState;