diff options
| author | zmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 00:27:53 +0000 |
|---|---|---|
| committer | zmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 00:27:53 +0000 |
| commit | 7004d7ebec6cd4de175d8f894c2a0c58fb6f41c8 (patch) | |
| tree | 5efa0e86cd64c61420909af28d43211d609ebf0f /gpu | |
| parent | c7a827e9d91099bae12379f92467e29a8d7ffaab (diff) | |
| download | chromium_src-7004d7ebec6cd4de175d8f894c2a0c58fb6f41c8.zip chromium_src-7004d7ebec6cd4de175d8f894c2a0c58fb6f41c8.tar.gz chromium_src-7004d7ebec6cd4de175d8f894c2a0c58fb6f41c8.tar.bz2 | |
Refactor and improve gpu_info_collector: collect information on linux;
collect extra information (driver_vendor, gl_renderer, etc.) on Mac/linux.
Note that this CL takes some code from rlp's long outstandingCL (with her
permission).
BUG=49579
TEST=unittest
Review URL: http://codereview.chromium.org/6346007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72055 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/gpu.gyp | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index f9f58af..dd22658 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -237,6 +237,7 @@ 'command_buffer_client', 'command_buffer_common', 'command_buffer_service', + 'gpu_unittest_utils', 'gles2_lib', 'gles2_implementation', 'gles2_cmd_helper', @@ -250,8 +251,6 @@ 'command_buffer/common/bitfield_helpers_test.cc', 'command_buffer/common/command_buffer_mock.cc', 'command_buffer/common/command_buffer_mock.h', - 'command_buffer/common/gl_mock.h', - 'command_buffer/common/gl_mock.cc', 'command_buffer/common/gles2_cmd_format_test.cc', 'command_buffer/common/gles2_cmd_format_test_autogen.h', 'command_buffer/common/gles2_cmd_id_test.cc', @@ -294,6 +293,22 @@ ], }, { + 'target_name': 'gpu_unittest_utils', + 'type': 'static_library', + 'dependencies': [ + '../app/app.gyp:app_base', + '../testing/gmock.gyp:gmock', + '../testing/gtest.gyp:gtest', + ], + 'include_dirs': [ + '..', + ], + 'sources': [ + 'command_buffer/common/gl_mock.h', + 'command_buffer/common/gl_mock.cc', + ], + }, + { 'target_name': 'gles2_demo_lib', 'type': 'static_library', 'dependencies': [ |