summaryrefslogtreecommitdiff
path: root/chromium/ui/gl/gl_gl_api_implementation.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/ui/gl/gl_gl_api_implementation.cc')
-rw-r--r--chromium/ui/gl/gl_gl_api_implementation.cc10
1 files changed, 2 insertions, 8 deletions
diff --git a/chromium/ui/gl/gl_gl_api_implementation.cc b/chromium/ui/gl/gl_gl_api_implementation.cc
index 3f3b0cded0f..369c3952808 100644
--- a/chromium/ui/gl/gl_gl_api_implementation.cc
+++ b/chromium/ui/gl/gl_gl_api_implementation.cc
@@ -544,15 +544,11 @@ bool VirtualGLApi::MakeCurrent(GLContext* virtual_context, GLSurface* surface) {
}
}
- bool state_dirtied_externally = real_context_->GetStateWasDirtiedExternally();
- real_context_->SetStateWasDirtiedExternally(false);
-
DCHECK_EQ(real_context_, GLContext::GetRealCurrent());
DCHECK(real_context_->IsCurrent(NULL));
DCHECK(virtual_context->IsCurrent(surface));
- if (state_dirtied_externally || switched_contexts ||
- virtual_context != current_context_) {
+ if (switched_contexts || virtual_context != current_context_) {
#if DCHECK_IS_ON()
GLenum error = glGetErrorFn();
// Accepting a context loss error here enables using debug mode to work on
@@ -578,9 +574,7 @@ bool VirtualGLApi::MakeCurrent(GLContext* virtual_context, GLSurface* surface) {
}
virtual_state->RestoreState(
- (current_state && !state_dirtied_externally && !switched_contexts)
- ? current_state
- : NULL);
+ (current_state && !switched_contexts) ? current_state : NULL);
}
SetGLApi(temp);
current_context_ = virtual_context;