diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-07 20:39:22 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-07 20:39:22 +0000 |
| commit | befd38c4ed911e912d65ab5f85d1d43720a0a359 (patch) | |
| tree | b4265ed6ef6ec78081cbfa530ad6d42424358c73 /gpu | |
| parent | 9919af589ddb2aa74aa7aca31877c8b5ad863ead (diff) | |
| download | chromium_src-befd38c4ed911e912d65ab5f85d1d43720a0a359.zip chromium_src-befd38c4ed911e912d65ab5f85d1d43720a0a359.tar.gz chromium_src-befd38c4ed911e912d65ab5f85d1d43720a0a359.tar.bz2 | |
Move GL_GLEXT_PROTOTYPES to gyp file
TEST=none
BUG=none
TBR=apatrick@chromium.org
Review URL: http://codereview.chromium.org/10375023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135712 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/tests/gl_texture_mailbox_unittests.cc | 4 | ||||
| -rw-r--r-- | gpu/command_buffer/tests/gl_unittests.cc | 4 | ||||
| -rw-r--r-- | gpu/command_buffer/tests/occlusion_query_unittests.cc | 4 | ||||
| -rw-r--r-- | gpu/gpu_common.gypi | 2 |
4 files changed, 1 insertions, 13 deletions
diff --git a/gpu/command_buffer/tests/gl_texture_mailbox_unittests.cc b/gpu/command_buffer/tests/gl_texture_mailbox_unittests.cc index 9f13344..d9633ec 100644 --- a/gpu/command_buffer/tests/gl_texture_mailbox_unittests.cc +++ b/gpu/command_buffer/tests/gl_texture_mailbox_unittests.cc @@ -2,10 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef GL_GLEXT_PROTOTYPES -#define GL_GLEXT_PROTOTYPES -#endif - #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> diff --git a/gpu/command_buffer/tests/gl_unittests.cc b/gpu/command_buffer/tests/gl_unittests.cc index afd3488..acac95e 100644 --- a/gpu/command_buffer/tests/gl_unittests.cc +++ b/gpu/command_buffer/tests/gl_unittests.cc @@ -2,10 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef GL_GLEXT_PROTOTYPES -#define GL_GLEXT_PROTOTYPES -#endif - #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> diff --git a/gpu/command_buffer/tests/occlusion_query_unittests.cc b/gpu/command_buffer/tests/occlusion_query_unittests.cc index 75902e98..efdabf3 100644 --- a/gpu/command_buffer/tests/occlusion_query_unittests.cc +++ b/gpu/command_buffer/tests/occlusion_query_unittests.cc @@ -2,10 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef GL_GLEXT_PROTOTYPES -#define GL_GLEXT_PROTOTYPES -#endif - #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> diff --git a/gpu/gpu_common.gypi b/gpu/gpu_common.gypi index 31322e7..2d13ec9 100644 --- a/gpu/gpu_common.gypi +++ b/gpu/gpu_common.gypi @@ -207,6 +207,7 @@ ], 'defines': [ 'GLES2_C_LIB_IMPLEMENTATION', + 'GL_GLEXT_PROTOTYPES', ], 'sources': [ 'command_buffer/tests/gl_test_utils.cc', @@ -245,7 +246,6 @@ 'command_buffer/tests/gl_manager.cc', 'command_buffer/tests/gl_manager.h', 'command_buffer/tests/gl_tests_main.cc', - 'command_buffer/tests/gl_unittests.cc', ], }, { |