diff options
author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 22:20:02 +0000 |
---|---|---|
committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 22:20:02 +0000 |
commit | 0bec8e295393f7512129be1fe91cbea9f9dc521a (patch) | |
tree | 7a9e18365fa1c5d432e566a92b13987825177b53 /gpu | |
parent | 50fb3e7c3445d50bccf9b9d91654c89ab132df3f (diff) | |
download | chromium_src-0bec8e295393f7512129be1fe91cbea9f9dc521a.zip chromium_src-0bec8e295393f7512129be1fe91cbea9f9dc521a.tar.gz chromium_src-0bec8e295393f7512129be1fe91cbea9f9dc521a.tar.bz2 |
gpu: add GLES/EGL support on linux
Review URL: http://codereview.chromium.org/2829007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50397 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
5 files changed, 2 insertions, 8 deletions
diff --git a/gpu/command_buffer/client/cmd_buffer_helper_test.cc b/gpu/command_buffer/client/cmd_buffer_helper_test.cc index 1f3b53e..6b5a9cf 100644 --- a/gpu/command_buffer/client/cmd_buffer_helper_test.cc +++ b/gpu/command_buffer/client/cmd_buffer_helper_test.cc @@ -4,7 +4,6 @@ // Tests for the Command Buffer Helper. -#include "base/at_exit.h" #include "base/callback.h" #include "base/message_loop.h" #include "base/scoped_nsautorelease_pool.h" @@ -154,7 +153,6 @@ class CommandBufferHelperTest : public testing::Test { CommandBufferOffset get_helper_put() { return helper_->put_; } base::ScopedNSAutoreleasePool autorelease_pool_; - base::AtExitManager at_exit_manager_; MessageLoop message_loop_; scoped_ptr<AsyncAPIMock> api_mock_; scoped_ptr<CommandBufferService> command_buffer_; diff --git a/gpu/command_buffer/client/fenced_allocator_test.cc b/gpu/command_buffer/client/fenced_allocator_test.cc index 21b511a..0fa215b 100644 --- a/gpu/command_buffer/client/fenced_allocator_test.cc +++ b/gpu/command_buffer/client/fenced_allocator_test.cc @@ -4,7 +4,6 @@ // This file contains the tests for the FencedAllocator class. -#include "base/at_exit.h" #include "base/callback.h" #include "base/message_loop.h" #include "base/scoped_nsautorelease_pool.h" @@ -68,7 +67,6 @@ class BaseFencedAllocatorTest : public testing::Test { } base::ScopedNSAutoreleasePool autorelease_pool_; - base::AtExitManager at_exit_manager_; MessageLoop message_loop_; scoped_ptr<AsyncAPIMock> api_mock_; scoped_ptr<CommandBufferService> command_buffer_; diff --git a/gpu/command_buffer/client/ring_buffer_test.cc b/gpu/command_buffer/client/ring_buffer_test.cc index b2ffb01..193906a 100644 --- a/gpu/command_buffer/client/ring_buffer_test.cc +++ b/gpu/command_buffer/client/ring_buffer_test.cc @@ -5,7 +5,6 @@ // This file contains the tests for the RingBuffer class. #include "gpu/command_buffer/client/ring_buffer.h" -#include "base/at_exit.h" #include "base/callback.h" #include "base/message_loop.h" #include "base/scoped_nsautorelease_pool.h" @@ -69,7 +68,6 @@ class BaseRingBufferTest : public testing::Test { } base::ScopedNSAutoreleasePool autorelease_pool_; - base::AtExitManager at_exit_manager_; MessageLoop message_loop_; scoped_ptr<AsyncAPIMock> api_mock_; scoped_ptr<CommandBufferService> command_buffer_; diff --git a/gpu/command_buffer/common/unittest_main.cc b/gpu/command_buffer/common/unittest_main.cc index f0df23f..86eb589 100644 --- a/gpu/command_buffer/common/unittest_main.cc +++ b/gpu/command_buffer/common/unittest_main.cc @@ -2,11 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/at_exit.h" #include "app/gfx/gl/gl_implementation.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" int main(int argc, char** argv) { + base::AtExitManager exit_manager; gfx::InitializeGLBindings(gfx::kGLImplementationMockGL); testing::InitGoogleMock(&argc, argv); return RUN_ALL_TESTS(); diff --git a/gpu/command_buffer/service/gpu_processor_unittest.cc b/gpu/command_buffer/service/gpu_processor_unittest.cc index 82aca8f..a91cc4c 100644 --- a/gpu/command_buffer/service/gpu_processor_unittest.cc +++ b/gpu/command_buffer/service/gpu_processor_unittest.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/at_exit.h" #include "base/message_loop.h" #include "base/scoped_nsautorelease_pool.h" #include "gpu/command_buffer/common/command_buffer_mock.h" @@ -75,7 +74,6 @@ class GPUProcessorTest : public testing::Test { } base::ScopedNSAutoreleasePool autorelease_pool_; - base::AtExitManager at_exit_manager; MessageLoop message_loop; scoped_ptr<MockCommandBuffer> command_buffer_; scoped_ptr<base::SharedMemory> shared_memory_; |