Commit 5a53d54e by Frank Henigman Committed by Commit Bot

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: 's avatarJamie Madill <jmadill@chromium.org>
parent 75066e7a
...@@ -2526,7 +2526,7 @@ void Context::initWorkarounds() ...@@ -2526,7 +2526,7 @@ void Context::initWorkarounds()
void Context::syncRendererState() void Context::syncRendererState()
{ {
const State::DirtyBits &dirtyBits = mGLState.getDirtyBits(); const State::DirtyBits &dirtyBits = mGLState.getDirtyBits();
mImplementation->syncState(mGLState, dirtyBits); mImplementation->syncState(dirtyBits);
mGLState.clearDirtyBits(); mGLState.clearDirtyBits();
mGLState.syncDirtyObjects(); mGLState.syncDirtyObjects();
} }
...@@ -2535,7 +2535,7 @@ void Context::syncRendererState(const State::DirtyBits &bitMask, ...@@ -2535,7 +2535,7 @@ void Context::syncRendererState(const State::DirtyBits &bitMask,
const State::DirtyObjects &objectMask) const State::DirtyObjects &objectMask)
{ {
const State::DirtyBits &dirtyBits = (mGLState.getDirtyBits() & bitMask); const State::DirtyBits &dirtyBits = (mGLState.getDirtyBits() & bitMask);
mImplementation->syncState(mGLState, dirtyBits); mImplementation->syncState(dirtyBits);
mGLState.clearDirtyBits(dirtyBits); mGLState.clearDirtyBits(dirtyBits);
mGLState.syncDirtyObjects(objectMask); mGLState.syncDirtyObjects(objectMask);
......
...@@ -123,7 +123,7 @@ class ContextImpl : public GLImplFactory ...@@ -123,7 +123,7 @@ class ContextImpl : public GLImplFactory
virtual void popGroupMarker() = 0; virtual void popGroupMarker() = 0;
// State sync with dirty bits. // 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 // Disjoint timer queries
virtual GLint getGPUDisjoint() = 0; virtual GLint getGPUDisjoint() = 0;
......
...@@ -242,9 +242,9 @@ void Context11::popGroupMarker() ...@@ -242,9 +242,9 @@ void Context11::popGroupMarker()
mRenderer->getAnnotator()->endEvent(); 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() GLint Context11::getGPUDisjoint()
......
...@@ -104,7 +104,7 @@ class Context11 : public ContextImpl ...@@ -104,7 +104,7 @@ class Context11 : public ContextImpl
void popGroupMarker() override; void popGroupMarker() override;
// State sync with dirty bits. // 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 // Disjoint timer queries
GLint getGPUDisjoint() override; GLint getGPUDisjoint() override;
......
...@@ -228,9 +228,9 @@ void Context9::popGroupMarker() ...@@ -228,9 +228,9 @@ void Context9::popGroupMarker()
mRenderer->getAnnotator()->endEvent(); 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() GLint Context9::getGPUDisjoint()
......
...@@ -104,7 +104,7 @@ class Context9 : public ContextImpl ...@@ -104,7 +104,7 @@ class Context9 : public ContextImpl
void popGroupMarker() override; void popGroupMarker() override;
// State sync with dirty bits. // 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 // Disjoint timer queries
GLint getGPUDisjoint() override; GLint getGPUDisjoint() override;
......
...@@ -328,9 +328,9 @@ void ContextGL::popGroupMarker() ...@@ -328,9 +328,9 @@ void ContextGL::popGroupMarker()
mRenderer->popGroupMarker(); 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() GLint ContextGL::getGPUDisjoint()
......
...@@ -156,7 +156,7 @@ class ContextGL : public ContextImpl ...@@ -156,7 +156,7 @@ class ContextGL : public ContextImpl
void popGroupMarker() override; void popGroupMarker() override;
// State sync with dirty bits. // 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 // Disjoint timer queries
GLint getGPUDisjoint() override; GLint getGPUDisjoint() override;
......
...@@ -250,7 +250,7 @@ void ContextNULL::popGroupMarker() ...@@ -250,7 +250,7 @@ void ContextNULL::popGroupMarker()
{ {
} }
void ContextNULL::syncState(const gl::State &state, const gl::State::DirtyBits &dirtyBits) void ContextNULL::syncState(const gl::State::DirtyBits &dirtyBits)
{ {
} }
......
...@@ -129,7 +129,7 @@ class ContextNULL : public ContextImpl ...@@ -129,7 +129,7 @@ class ContextNULL : public ContextImpl
void popGroupMarker() override; void popGroupMarker() override;
// State sync with dirty bits. // 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 // Disjoint timer queries
GLint getGPUDisjoint() override; GLint getGPUDisjoint() override;
......
...@@ -382,7 +382,7 @@ void ContextVk::popGroupMarker() ...@@ -382,7 +382,7 @@ void ContextVk::popGroupMarker()
UNIMPLEMENTED(); 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. // TODO(jmadill): Vulkan dirty bits.
} }
......
...@@ -72,7 +72,7 @@ class ContextVk : public ContextImpl ...@@ -72,7 +72,7 @@ class ContextVk : public ContextImpl
void popGroupMarker() override; void popGroupMarker() override;
// State sync with dirty bits. // 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 // Disjoint timer queries
GLint getGPUDisjoint() override; GLint getGPUDisjoint() override;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment