diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-12 00:51:30 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-12 00:51:30 +0000 |
| commit | 23716fb643383cb737e564d55234a7c2d58eba00 (patch) | |
| tree | edbde1c9b816bf19a4e4683052cdb70263e2808b /gpu/command_buffer/service/gpu_processor.cc | |
| parent | 32fc6ab6167aa03a7197d37aea94e3ee98d70c59 (diff) | |
| download | chromium_src-23716fb643383cb737e564d55234a7c2d58eba00.zip chromium_src-23716fb643383cb737e564d55234a7c2d58eba00.tar.gz chromium_src-23716fb643383cb737e564d55234a7c2d58eba00.tar.bz2 | |
Revert 77899 - Connect up --disable-gl-multisampling to command buffer
Plumb the --disable-gl-multisampling flag in to the command buffer, so it won't report the extension to any consumers.
BUG=75181
TEST=webgl antialias test
TBR=jbauman
Review URL: http://codereview.chromium.org/6623063
TBR=jbauman@chromium.org
Review URL: http://codereview.chromium.org/6685022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77901 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service/gpu_processor.cc')
| -rw-r--r-- | gpu/command_buffer/service/gpu_processor.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/gpu/command_buffer/service/gpu_processor.cc b/gpu/command_buffer/service/gpu_processor.cc index 45d21d7..b36db6a 100644 --- a/gpu/command_buffer/service/gpu_processor.cc +++ b/gpu/command_buffer/service/gpu_processor.cc @@ -52,14 +52,12 @@ GPUProcessor::~GPUProcessor() { Destroy(); } -bool GPUProcessor::InitializeCommon( - gfx::GLContext* context, - const gfx::Size& size, - const gles2::DisallowedExtensions& disallowed_extensions, - const char* allowed_extensions, - const std::vector<int32>& attribs, - gles2::GLES2Decoder* parent_decoder, - uint32 parent_texture_id) { +bool GPUProcessor::InitializeCommon(gfx::GLContext* context, + const gfx::Size& size, + const char* allowed_extensions, + const std::vector<int32>& attribs, + gles2::GLES2Decoder* parent_decoder, + uint32 parent_texture_id) { DCHECK(context); if (!context->MakeCurrent()) @@ -92,7 +90,6 @@ bool GPUProcessor::InitializeCommon( // Initialize the decoder with either the view or pbuffer GLContext. if (!decoder_->Initialize(context, size, - disallowed_extensions, allowed_extensions, attribs, parent_decoder, |