diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 02:59:47 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 02:59:47 +0000 |
| commit | df0729f92408c852c004f3b16880e7b67866d38a (patch) | |
| tree | 62d78c4a9e8e99f5724150ee62c1e2a17fe41349 /gpu/gpu.gyp | |
| parent | ba29d04db72509c150a87483b145f31797a8b892 (diff) | |
| download | chromium_src-df0729f92408c852c004f3b16880e7b67866d38a.zip chromium_src-df0729f92408c852c004f3b16880e7b67866d38a.tar.gz chromium_src-df0729f92408c852c004f3b16880e7b67866d38a.tar.bz2 | |
Fix IsExtensionAvailable so it calls GetStringHelper
This is so it does not trigger the single threaded checks
TEST=unit test
BUG=none
R=zmo@chromium.org
Review URL: http://codereview.chromium.org/9006021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115265 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
| -rw-r--r-- | gpu/gpu.gyp | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 8b70850..2873c29 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -100,6 +100,27 @@ 'type': 'static_library', 'defines': [ 'GLES2_SUPPORT_CLIENT_SIDE_ARRAYS=1', + ], + 'dependencies': [ + '../base/base.gyp:base', + 'gles2_cmd_helper', + ], + 'all_dependent_settings': { + 'include_dirs': [ + # For GLES2/gl2.h + '<(DEPTH)/third_party/khronos', + ], + }, + 'sources': [ + '<@(gles2_implementation_source_files)', + ], + }, + { + # Library emulates GLES2 using command_buffers. + 'target_name': 'gles2_implementation_client_side_arrays_no_check', + 'type': 'static_library', + 'defines': [ + 'GLES2_SUPPORT_CLIENT_SIDE_ARRAYS=1', 'GLES2_CONFORMANCE_TESTS=1', ], 'dependencies': [ @@ -138,7 +159,7 @@ 'GLES2_CONFORMANCE_TESTS=1', ], 'dependencies': [ - 'gles2_implementation_client_side_arrays', + 'gles2_implementation_client_side_arrays_no_check', ], 'sources': [ '<@(gles2_c_lib_source_files)', |