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

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

Issue 893213002: Revert of Make GL bindings conditional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months 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/error_state_mock.h" 5 #include "gpu/command_buffer/service/error_state_mock.h"
6 #include "gpu/command_buffer/service/framebuffer_manager.h" 6 #include "gpu/command_buffer/service/framebuffer_manager.h"
7 #include "gpu/command_buffer/service/feature_info.h" 7 #include "gpu/command_buffer/service/feature_info.h"
8 #include "gpu/command_buffer/service/gpu_service_test.h" 8 #include "gpu/command_buffer/service/gpu_service_test.h"
9 #include "gpu/command_buffer/service/renderbuffer_manager.h" 9 #include "gpu/command_buffer/service/renderbuffer_manager.h"
10 #include "gpu/command_buffer/service/test_helper.h" 10 #include "gpu/command_buffer/service/test_helper.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 kMaxRectangleTextureSize, 119 kMaxRectangleTextureSize,
120 kUseDefaultTextures)); 120 kUseDefaultTextures));
121 } 121 }
122 ~FramebufferInfoTest() override { 122 ~FramebufferInfoTest() override {
123 manager_.Destroy(false); 123 manager_.Destroy(false);
124 texture_manager_->Destroy(false); 124 texture_manager_->Destroy(false);
125 renderbuffer_manager_.Destroy(false); 125 renderbuffer_manager_.Destroy(false);
126 } 126 }
127 127
128 protected: 128 protected:
129 void SetUp() override { 129 void SetUp() override { InitializeContext("", ""); }
130 InitializeContext("2.0", "GL_EXT_framebuffer_object");
131 }
132 130
133 void InitializeContext(const char* gl_version, const char* extensions) { 131 void InitializeContext(const char* gl_version, const char* extensions) {
134 GpuServiceTest::SetUpWithGLVersion(gl_version, extensions); 132 GpuServiceTest::SetUp();
135 TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(gl_.get(), 133 TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(gl_.get(),
136 extensions, "", gl_version); 134 extensions, "", gl_version);
137 feature_info_->Initialize(); 135 feature_info_->Initialize();
138 manager_.CreateFramebuffer(kClient1Id, kService1Id); 136 manager_.CreateFramebuffer(kClient1Id, kService1Id);
139 error_state_.reset(new ::testing::StrictMock<gles2::MockErrorState>()); 137 error_state_.reset(new ::testing::StrictMock<gles2::MockErrorState>());
140 framebuffer_ = manager_.GetFramebuffer(kClient1Id); 138 framebuffer_ = manager_.GetFramebuffer(kClient1Id);
141 ASSERT_TRUE(framebuffer_ != NULL); 139 ASSERT_TRUE(framebuffer_ != NULL);
142 } 140 }
143 141
144 FramebufferManager manager_; 142 FramebufferManager manager_;
(...skipping 821 matching lines...) Expand 10 before | Expand all | Expand 10 after
966 .WillOnce(Return(GL_FRAMEBUFFER_COMPLETE)) 964 .WillOnce(Return(GL_FRAMEBUFFER_COMPLETE))
967 .RetiresOnSaturation(); 965 .RetiresOnSaturation();
968 } 966 }
969 framebuffer_->GetStatus(texture_manager_.get(), GL_READ_FRAMEBUFFER); 967 framebuffer_->GetStatus(texture_manager_.get(), GL_READ_FRAMEBUFFER);
970 } 968 }
971 969
972 } // namespace gles2 970 } // namespace gles2
973 } // namespace gpu 971 } // namespace gpu
974 972
975 973
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/feature_info_unittest.cc ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698