diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 23:03:32 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 23:03:32 +0000 |
| commit | 951ce6fd1a8ea750abe336b0e54563c44b92915c (patch) | |
| tree | 519774001ea15685d7a27b10f5ea3fbfe00919a1 /gpu | |
| parent | 8948387583a5fdb283527fc34293cf74f968afa9 (diff) | |
| download | chromium_src-951ce6fd1a8ea750abe336b0e54563c44b92915c.zip chromium_src-951ce6fd1a8ea750abe336b0e54563c44b92915c.tar.gz chromium_src-951ce6fd1a8ea750abe336b0e54563c44b92915c.tar.bz2 | |
Log GLenums as strings in service
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/8936011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114516 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/command_buffer.gyp | 37 | ||||
| -rw-r--r-- | gpu/gpu.gyp | 5 |
2 files changed, 38 insertions, 4 deletions
diff --git a/gpu/command_buffer/command_buffer.gyp b/gpu/command_buffer/command_buffer.gyp new file mode 100644 index 0000000..3f0b815 --- /dev/null +++ b/gpu/command_buffer/command_buffer.gyp @@ -0,0 +1,37 @@ +# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'variables': { + 'chromium_code': 1, + }, + 'targets': [ + { + 'target_name': 'gles2_utils', + 'type': 'static_library', + 'include_dirs': [ + '<(DEPTH)/third_party/khronos', + ], + 'all_dependent_settings': { + 'include_dirs': [ + '<(DEPTH)/third_party/khronos', + ], + }, + 'dependencies': [ + '../../base/base.gyp:base', + ], + 'export_dependent_settings': [ + '../../base/base.gyp:base', + ], + 'sources': [ + 'common/gles2_cmd_format.h', + 'common/gles2_cmd_utils.cc', + 'common/gles2_cmd_utils.h', + 'common/logging.cc', + 'common/logging.h', + ], + }, + ], +} + diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index adbc241..8b70850 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -39,6 +39,7 @@ }, 'dependencies': [ '../base/base.gyp:base', + 'command_buffer/command_buffer.gyp:gles2_utils', ], 'export_dependent_settings': [ '../base/base.gyp:base', @@ -55,12 +56,8 @@ 'command_buffer/common/gles2_cmd_format_autogen.h', 'command_buffer/common/gles2_cmd_format.cc', 'command_buffer/common/gles2_cmd_format.h', - 'command_buffer/common/gles2_cmd_utils.cc', - 'command_buffer/common/gles2_cmd_utils.h', 'command_buffer/common/id_allocator.cc', 'command_buffer/common/id_allocator.h', - 'command_buffer/common/logging.cc', - 'command_buffer/common/logging.h', 'command_buffer/common/thread_local.h', 'command_buffer/common/types.h', ], |