Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(432)

Side by Side Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

Issue 2543313002: ui/gl: rename ClearGLBindings to ShutdownGL (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 } 560 }
561 } 561 }
562 562
563 decoder_->EndDecoding(); 563 decoder_->EndDecoding();
564 decoder_->Destroy(!decoder_->WasContextLost()); 564 decoder_->Destroy(!decoder_->WasContextLost());
565 decoder_.reset(); 565 decoder_.reset();
566 group_->Destroy(mock_decoder_.get(), false); 566 group_->Destroy(mock_decoder_.get(), false);
567 engine_.reset(); 567 engine_.reset();
568 ::gl::MockGLInterface::SetGLInterface(NULL); 568 ::gl::MockGLInterface::SetGLInterface(NULL);
569 gl_.reset(); 569 gl_.reset();
570 gl::init::ClearGLBindings(); 570 gl::init::ShutdownGL();
571 } 571 }
572 572
573 void GLES2DecoderTestBase::TearDown() { 573 void GLES2DecoderTestBase::TearDown() {
574 ResetDecoder(); 574 ResetDecoder();
575 } 575 }
576 576
577 void GLES2DecoderTestBase::ExpectEnableDisable(GLenum cap, bool enable) { 577 void GLES2DecoderTestBase::ExpectEnableDisable(GLenum cap, bool enable) {
578 if (enable) { 578 if (enable) {
579 EXPECT_CALL(*gl_, Enable(cap)) 579 EXPECT_CALL(*gl_, Enable(cap))
580 .Times(1) 580 .Times(1)
(...skipping 1542 matching lines...) Expand 10 before | Expand all | Expand 10 after
2123 SetupDefaultProgram(); 2123 SetupDefaultProgram();
2124 } 2124 }
2125 2125
2126 // Include the auto-generated part of this file. We split this because it means 2126 // Include the auto-generated part of this file. We split this because it means
2127 // we can easily edit the non-auto generated parts right here in this file 2127 // we can easily edit the non-auto generated parts right here in this file
2128 // instead of having to edit some template or the code generator. 2128 // instead of having to edit some template or the code generator.
2129 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" 2129 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h"
2130 2130
2131 } // namespace gles2 2131 } // namespace gles2
2132 } // namespace gpu 2132 } // namespace gpu
OLDNEW
« no previous file with comments | « chrome/browser/android/vr_shell/vr_shell_renderer.cc ('k') | gpu/command_buffer/service/gpu_service_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698