Remove unneeded ContextImpl::syncState parameter.
The 'state' parameter passed to ContextImpl::syncState() is already
available in ContextImpl as mState.getState().
BUG=none
Change-Id: I13283664579fa04ae67b1d1bbc0cb4426a950b97
Reviewed-on: https://chromium-review.googlesource.com/444099
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
diff --git a/src/libANGLE/renderer/ContextImpl.h b/src/libANGLE/renderer/ContextImpl.h
index b17990a..1fd48c6 100644
--- a/src/libANGLE/renderer/ContextImpl.h
+++ b/src/libANGLE/renderer/ContextImpl.h
@@ -123,7 +123,7 @@
virtual void popGroupMarker() = 0;
// State sync with dirty bits.
- virtual void syncState(const gl::State &state, const gl::State::DirtyBits &dirtyBits) = 0;
+ virtual void syncState(const gl::State::DirtyBits &dirtyBits) = 0;
// Disjoint timer queries
virtual GLint getGPUDisjoint() = 0;
diff --git a/src/libANGLE/renderer/d3d/d3d11/Context11.cpp b/src/libANGLE/renderer/d3d/d3d11/Context11.cpp
index 90b0427..310189e 100644
--- a/src/libANGLE/renderer/d3d/d3d11/Context11.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/Context11.cpp
@@ -242,9 +242,9 @@
mRenderer->getAnnotator()->endEvent();
}
-void Context11::syncState(const gl::State &state, const gl::State::DirtyBits &dirtyBits)
+void Context11::syncState(const gl::State::DirtyBits &dirtyBits)
{
- mRenderer->getStateManager()->syncState(state, dirtyBits);
+ mRenderer->getStateManager()->syncState(mState.getState(), dirtyBits);
}
GLint Context11::getGPUDisjoint()
diff --git a/src/libANGLE/renderer/d3d/d3d11/Context11.h b/src/libANGLE/renderer/d3d/d3d11/Context11.h
index 11a5d48..dd30119 100644
--- a/src/libANGLE/renderer/d3d/d3d11/Context11.h
+++ b/src/libANGLE/renderer/d3d/d3d11/Context11.h
@@ -104,7 +104,7 @@
void popGroupMarker() override;
// State sync with dirty bits.
- void syncState(const gl::State &state, const gl::State::DirtyBits &dirtyBits) override;
+ void syncState(const gl::State::DirtyBits &dirtyBits) override;
// Disjoint timer queries
GLint getGPUDisjoint() override;
diff --git a/src/libANGLE/renderer/d3d/d3d9/Context9.cpp b/src/libANGLE/renderer/d3d/d3d9/Context9.cpp
index 9dcc601..3933aac 100644
--- a/src/libANGLE/renderer/d3d/d3d9/Context9.cpp
+++ b/src/libANGLE/renderer/d3d/d3d9/Context9.cpp
@@ -228,9 +228,9 @@
mRenderer->getAnnotator()->endEvent();
}
-void Context9::syncState(const gl::State &state, const gl::State::DirtyBits &dirtyBits)
+void Context9::syncState(const gl::State::DirtyBits &dirtyBits)
{
- mRenderer->getStateManager()->syncState(state, dirtyBits);
+ mRenderer->getStateManager()->syncState(mState.getState(), dirtyBits);
}
GLint Context9::getGPUDisjoint()
diff --git a/src/libANGLE/renderer/d3d/d3d9/Context9.h b/src/libANGLE/renderer/d3d/d3d9/Context9.h
index 01c961f..9670cf3 100644
--- a/src/libANGLE/renderer/d3d/d3d9/Context9.h
+++ b/src/libANGLE/renderer/d3d/d3d9/Context9.h
@@ -104,7 +104,7 @@
void popGroupMarker() override;
// State sync with dirty bits.
- void syncState(const gl::State &state, const gl::State::DirtyBits &dirtyBits) override;
+ void syncState(const gl::State::DirtyBits &dirtyBits) override;
// Disjoint timer queries
GLint getGPUDisjoint() override;
diff --git a/src/libANGLE/renderer/gl/ContextGL.cpp b/src/libANGLE/renderer/gl/ContextGL.cpp
index 79f2f9f..23de402 100644
--- a/src/libANGLE/renderer/gl/ContextGL.cpp
+++ b/src/libANGLE/renderer/gl/ContextGL.cpp
@@ -328,9 +328,9 @@
mRenderer->popGroupMarker();
}
-void ContextGL::syncState(const gl::State &state, const gl::State::DirtyBits &dirtyBits)
+void ContextGL::syncState(const gl::State::DirtyBits &dirtyBits)
{
- mRenderer->getStateManager()->syncState(state, dirtyBits);
+ mRenderer->getStateManager()->syncState(mState.getState(), dirtyBits);
}
GLint ContextGL::getGPUDisjoint()
diff --git a/src/libANGLE/renderer/gl/ContextGL.h b/src/libANGLE/renderer/gl/ContextGL.h
index 28fd71c..16e5a6d 100644
--- a/src/libANGLE/renderer/gl/ContextGL.h
+++ b/src/libANGLE/renderer/gl/ContextGL.h
@@ -156,7 +156,7 @@
void popGroupMarker() override;
// State sync with dirty bits.
- void syncState(const gl::State &state, const gl::State::DirtyBits &dirtyBits) override;
+ void syncState(const gl::State::DirtyBits &dirtyBits) override;
// Disjoint timer queries
GLint getGPUDisjoint() override;
diff --git a/src/libANGLE/renderer/null/ContextNULL.cpp b/src/libANGLE/renderer/null/ContextNULL.cpp
index 6fcf819..51d3a2a 100644
--- a/src/libANGLE/renderer/null/ContextNULL.cpp
+++ b/src/libANGLE/renderer/null/ContextNULL.cpp
@@ -250,7 +250,7 @@
{
}
-void ContextNULL::syncState(const gl::State &state, const gl::State::DirtyBits &dirtyBits)
+void ContextNULL::syncState(const gl::State::DirtyBits &dirtyBits)
{
}
diff --git a/src/libANGLE/renderer/null/ContextNULL.h b/src/libANGLE/renderer/null/ContextNULL.h
index 11b0c62..5f74387 100644
--- a/src/libANGLE/renderer/null/ContextNULL.h
+++ b/src/libANGLE/renderer/null/ContextNULL.h
@@ -129,7 +129,7 @@
void popGroupMarker() override;
// State sync with dirty bits.
- void syncState(const gl::State &state, const gl::State::DirtyBits &dirtyBits) override;
+ void syncState(const gl::State::DirtyBits &dirtyBits) override;
// Disjoint timer queries
GLint getGPUDisjoint() override;
diff --git a/src/libANGLE/renderer/vulkan/ContextVk.cpp b/src/libANGLE/renderer/vulkan/ContextVk.cpp
index f2e1193..8206c16 100644
--- a/src/libANGLE/renderer/vulkan/ContextVk.cpp
+++ b/src/libANGLE/renderer/vulkan/ContextVk.cpp
@@ -382,7 +382,7 @@
UNIMPLEMENTED();
}
-void ContextVk::syncState(const gl::State & /*state*/, const gl::State::DirtyBits & /*dirtyBits*/)
+void ContextVk::syncState(const gl::State::DirtyBits & /*dirtyBits*/)
{
// TODO(jmadill): Vulkan dirty bits.
}
diff --git a/src/libANGLE/renderer/vulkan/ContextVk.h b/src/libANGLE/renderer/vulkan/ContextVk.h
index 0f2a9b6..f5b56e1 100644
--- a/src/libANGLE/renderer/vulkan/ContextVk.h
+++ b/src/libANGLE/renderer/vulkan/ContextVk.h
@@ -72,7 +72,7 @@
void popGroupMarker() override;
// State sync with dirty bits.
- void syncState(const gl::State &state, const gl::State::DirtyBits &dirtyBits) override;
+ void syncState(const gl::State::DirtyBits &dirtyBits) override;
// Disjoint timer queries
GLint getGPUDisjoint() override;