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

Unified Diff: gpu/command_buffer/client/gles2_implementation_unittest.cc

Issue 455783002: GPU context creation code duplication cleanup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Fix even more build dependencies Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/client/gles2_implementation.cc ('k') | gpu/command_buffer/client/share_group.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/client/gles2_implementation_unittest.cc
diff --git a/gpu/command_buffer/client/gles2_implementation_unittest.cc b/gpu/command_buffer/client/gles2_implementation_unittest.cc
index a318ab8f33f2a687a377b3e7e5fbba7aaab43470..80a2e4161394540dcfb8b625ac01bb9e570a4cef 100644
--- a/gpu/command_buffer/client/gles2_implementation_unittest.cc
+++ b/gpu/command_buffer/client/gles2_implementation_unittest.cc
@@ -393,7 +393,8 @@ class GLES2ImplementationTest : public testing::Test {
TestContext() : commands_(NULL), token_(0) {}
bool Initialize(ShareGroup* share_group,
- bool bind_generates_resource,
+ bool bind_generates_resource_client,
+ bool bind_generates_resource_service,
bool lose_context_when_out_of_memory) {
command_buffer_.reset(new StrictMock<MockClientCommandBuffer>());
if (!command_buffer_->Initialize())
@@ -428,7 +429,7 @@ class GLES2ImplementationTest : public testing::Test {
int_state.num_compressed_texture_formats = kNumCompressedTextureFormats;
int_state.num_shader_binary_formats = kNumShaderBinaryFormats;
int_state.bind_generates_resource_chromium =
- bind_generates_resource ? 1 : 0;
+ bind_generates_resource_service ? 1 : 0;
// This just happens to work for now because IntState has 1 GLint per
// state.
@@ -449,7 +450,7 @@ class GLES2ImplementationTest : public testing::Test {
gl_.reset(new GLES2Implementation(helper_.get(),
share_group,
transfer_buffer_.get(),
- bind_generates_resource,
+ bind_generates_resource_client,
lose_context_when_out_of_memory,
gpu_control_.get()));
@@ -537,12 +538,13 @@ class GLES2ImplementationTest : public testing::Test {
bool Initialize(const ContextInitOptions& init_options) {
bool success = true;
- share_group_ = new ShareGroup(init_options.bind_generates_resource_service);
+ share_group_ = new ShareGroup(init_options.bind_generates_resource_client);
for (int i = 0; i < kNumTestContexts; i++) {
if (!test_contexts_[i].Initialize(
share_group_.get(),
init_options.bind_generates_resource_client,
+ init_options.bind_generates_resource_service,
init_options.lose_context_when_out_of_memory))
success = false;
}
« no previous file with comments | « gpu/command_buffer/client/gles2_implementation.cc ('k') | gpu/command_buffer/client/share_group.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698