diff options
| author | oetuaho@nvidia.com <oetuaho@nvidia.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 11:50:40 +0000 |
|---|---|---|
| committer | oetuaho@nvidia.com <oetuaho@nvidia.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 11:51:59 +0000 |
| commit | 845c4e3f17bde2c8bd1322e17c832bb15f315186 (patch) | |
| tree | 41a1a63430dbcb223724c30a1d976299ae22a4cc /content/common/gpu/gpu_command_buffer_stub.cc | |
| parent | 7d7b9587f4f1b7feff557b70a2bb876a7ba09d0d (diff) | |
| download | chromium_src-845c4e3f17bde2c8bd1322e17c832bb15f315186.zip chromium_src-845c4e3f17bde2c8bd1322e17c832bb15f315186.tar.gz chromium_src-845c4e3f17bde2c8bd1322e17c832bb15f315186.tar.bz2 | |
GPU context creation code duplication cleanup
Use ContextCreationAttribHelper through the context creation in both
in-process and out-of-process cases, instead of duplicate structures such
as GLInProcessContextAttribs. Enums used for serializing the attributes
are now defined in only one place, instead of three.
Remove small pieces of dead code related to share groups.
share_resources_ attrib is removed since it is not in use anywhere.
gpu_unittests are changed to better model how bind_generates_resource
gets set, and new checks are added to make sure it is set consistently
everywhere.
TEST=WebGL conformance tests (with and without --in-process-gpu),
cc_unittests, gpu_unittests
BUG=
Review URL: https://codereview.chromium.org/455783002
Cr-Commit-Position: refs/heads/master@{#289269}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/gpu/gpu_command_buffer_stub.cc')
| -rw-r--r-- | content/common/gpu/gpu_command_buffer_stub.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc index 989e00b..22b90a3 100644 --- a/content/common/gpu/gpu_command_buffer_stub.cc +++ b/content/common/gpu/gpu_command_buffer_stub.cc @@ -186,14 +186,14 @@ GpuCommandBufferStub::GpuCommandBufferStub( if (share_group) { context_group_ = share_group->context_group_; DCHECK(context_group_->bind_generates_resource() == - attrib_parser.bind_generates_resource_); + attrib_parser.bind_generates_resource); } else { context_group_ = new gpu::gles2::ContextGroup( mailbox_manager, new GpuCommandBufferMemoryTracker(channel), channel_->gpu_channel_manager()->shader_translator_cache(), NULL, - attrib_parser.bind_generates_resource_); + attrib_parser.bind_generates_resource); } use_virtualized_gl_context_ |= |