diff options
| author | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-12 00:33:42 +0000 |
|---|---|---|
| committer | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-12 00:33:42 +0000 |
| commit | 32fc6ab6167aa03a7197d37aea94e3ee98d70c59 (patch) | |
| tree | edbf41f0b79362ecced16a82dd4e459200eacace /gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc | |
| parent | ec029c308d1a7b64f8ae0981023ffb7acbb10bff (diff) | |
| download | chromium_src-32fc6ab6167aa03a7197d37aea94e3ee98d70c59.zip chromium_src-32fc6ab6167aa03a7197d37aea94e3ee98d70c59.tar.gz chromium_src-32fc6ab6167aa03a7197d37aea94e3ee98d70c59.tar.bz2 | |
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
Review URL: http://codereview.chromium.org/6623063
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77899 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc')
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc index 18a920f..0699e3b 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc @@ -57,9 +57,10 @@ void GLES2DecoderTestBase::InitDecoder( InSequence sequence; - TestHelper::SetupContextGroupInitExpectations(gl_.get(), extensions); + TestHelper::SetupContextGroupInitExpectations(gl_.get(), + DisallowedExtensions(), extensions); - EXPECT_TRUE(group_->Initialize(extensions)); + EXPECT_TRUE(group_->Initialize(DisallowedExtensions(), extensions)); EXPECT_CALL(*gl_, GetIntegerv(GL_ALPHA_BITS, _)) .WillOnce(SetArgumentPointee<1>(has_alpha_backbuffer ? 8 : 0)) @@ -129,7 +130,8 @@ void GLES2DecoderTestBase::InitDecoder( decoder_.reset(GLES2Decoder::Create(group_.get())); decoder_->Initialize( - context_, context_->GetSize(), NULL, std::vector<int32>(), NULL, 0); + context_, context_->GetSize(), DisallowedExtensions(), + NULL, std::vector<int32>(), NULL, 0); decoder_->set_engine(engine_.get()); EXPECT_CALL(*gl_, GenBuffersARB(_, _)) |