diff options
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/client/ref_counted.h | 6 | ||||
| -rw-r--r-- | gpu/command_buffer/command_buffer.gyp | 20 | ||||
| -rw-r--r-- | gpu/command_buffer/command_buffer.gypi | 30 | ||||
| -rw-r--r-- | gpu/command_buffer/command_buffer_untrusted.gyp | 34 | ||||
| -rw-r--r-- | gpu/command_buffer_common.gypi | 4 | ||||
| -rw-r--r-- | gpu/gpu.gyp | 297 | ||||
| -rw-r--r-- | gpu/gpu_common.gypi | 293 | ||||
| -rw-r--r-- | gpu/gpu_untrusted.gyp | 116 |
8 files changed, 488 insertions, 312 deletions
diff --git a/gpu/command_buffer/client/ref_counted.h b/gpu/command_buffer/client/ref_counted.h index 83346d35..e3c8f27 100644 --- a/gpu/command_buffer/client/ref_counted.h +++ b/gpu/command_buffer/client/ref_counted.h @@ -5,7 +5,11 @@ #ifndef GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_ #define GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_ -#if defined(__native_client__) +// TODO(bbudge) The NaCl SRPC proxy can't depend on base, so we define our own +// ref_counted. This causes duplicate class warnings in the NaCl IPC proxy, +// which uses base. Remove the custom ref_counted class after NaCl has switched +// proxies. +#if defined(__native_client__) && !defined(NACL_PPAPI_IPC_PROXY) #include "native_client/src/include/ref_counted.h" namespace gpu { using nacl::RefCountedThreadSafe; diff --git a/gpu/command_buffer/command_buffer.gyp b/gpu/command_buffer/command_buffer.gyp index dffac1c..7a4c10a 100644 --- a/gpu/command_buffer/command_buffer.gyp +++ b/gpu/command_buffer/command_buffer.gyp @@ -6,13 +6,16 @@ 'variables': { 'chromium_code': 1, }, + 'includes': [ + 'command_buffer.gypi', + ], 'targets': [ { 'target_name': 'gles2_utils', 'type': '<(component)', - 'include_dirs': [ - '<(DEPTH)/third_party/khronos', - ], + 'variables': { + 'gles2_utils_target': 1, + }, 'all_dependent_settings': { 'include_dirs': [ '<(DEPTH)/third_party/khronos', @@ -24,17 +27,6 @@ 'export_dependent_settings': [ '../../base/base.gyp:base', ], - 'defines': [ - 'GLES2_UTILS_IMPLEMENTATION', - ], - 'sources': [ - 'common/gles2_cmd_format.h', - 'common/gles2_cmd_utils.cc', - 'common/gles2_cmd_utils.h', - 'common/gles2_utils_export.h', - 'common/logging.cc', - 'common/logging.h', - ], }, ], } diff --git a/gpu/command_buffer/command_buffer.gypi b/gpu/command_buffer/command_buffer.gypi new file mode 100644 index 0000000..057a7ce --- /dev/null +++ b/gpu/command_buffer/command_buffer.gypi @@ -0,0 +1,30 @@ +# Copyright (c) 2012 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. + +{ + 'target_defaults': { + 'variables': { + 'gles2_utils_target': 0, + }, + 'target_conditions': [ + # This part is shared between the targets defined below. + ['gles2_utils_target==1', { + 'defines': [ + 'GLES2_UTILS_IMPLEMENTATION', + ], + 'include_dirs': [ + '<(DEPTH)/third_party/khronos', + ], + 'sources': [ + 'common/gles2_cmd_format.h', + 'common/gles2_cmd_utils.cc', + 'common/gles2_cmd_utils.h', + 'common/gles2_utils_export.h', + 'common/logging.cc', + 'common/logging.h', + ], + }], + ], + }, +} diff --git a/gpu/command_buffer/command_buffer_untrusted.gyp b/gpu/command_buffer/command_buffer_untrusted.gyp new file mode 100644 index 0000000..25987e7 --- /dev/null +++ b/gpu/command_buffer/command_buffer_untrusted.gyp @@ -0,0 +1,34 @@ +# Copyright (c) 2012 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, + }, + 'includes': [ + '../../native_client/build/untrusted.gypi', + 'command_buffer.gypi', + ], + 'conditions': [ + ['disable_nacl==0 and disable_nacl_untrusted==0', { + 'targets': [ + { + 'target_name': 'gles2_utils_untrusted', + 'type': 'none', + 'variables': { + 'gles2_utils_target': 1, + 'nacl_untrusted_build': 1, + 'nlib_target': 'libgles2_utils_untrusted.a', + 'build_glibc': 0, + 'build_newlib': 1, + }, + 'dependencies': [ + '../../native_client/tools.gyp:prep_toolchain', + '../../base/base_untrusted.gyp:base_untrusted', + ], + }, + ], + }], + ], +} diff --git a/gpu/command_buffer_common.gypi b/gpu/command_buffer_common.gypi index 4ec2001..d998321 100644 --- a/gpu/command_buffer_common.gypi +++ b/gpu/command_buffer_common.gypi @@ -11,10 +11,6 @@ '<(DEPTH)/third_party/khronos', ], }, - 'dependencies': [ - '../base/base.gyp:base', - 'command_buffer/command_buffer.gyp:gles2_utils', - ], 'sources': [ 'command_buffer/common/bitfield_helpers.h', 'command_buffer/common/buffer.h', diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 1b8d54d..692f8da 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -3,37 +3,274 @@ # found in the LICENSE file. { - 'variables': { - 'chromium_code': 1, - # These are defined here because we need to build this library twice. Once - # with extra parameter checking. Once with no parameter checking to be 100% - # OpenGL ES 2.0 compliant for the conformance tests. - 'gles2_c_lib_source_files': [ - 'command_buffer/client/gles2_c_lib.cc', - 'command_buffer/client/gles2_c_lib_autogen.h', - 'command_buffer/client/gles2_c_lib_export.h', - 'command_buffer/client/gles2_lib.h', - 'command_buffer/client/gles2_lib.cc', - ], - # These are defined here because we need to build this library twice. Once - # with without support for client side arrays and once with for pepper and - # the OpenGL ES 2.0 compliant for the conformance tests. - 'gles2_implementation_source_files': [ - 'command_buffer/client/gles2_impl_export.h', - 'command_buffer/client/gles2_implementation_autogen.h', - 'command_buffer/client/gles2_implementation.cc', - 'command_buffer/client/gles2_implementation.h', - 'command_buffer/client/program_info_manager.cc', - 'command_buffer/client/program_info_manager.h', - 'command_buffer/client/query_tracker.cc', - 'command_buffer/client/query_tracker.h', - 'command_buffer/client/share_group.cc', - 'command_buffer/client/share_group.h', - ] - }, 'includes': [ 'gpu_common.gypi', ], + 'targets': [ + { + # Library emulates GLES2 using command_buffers. + 'target_name': 'gles2_implementation', + 'type': '<(component)', + 'dependencies': [ + '../base/base.gyp:base', + '../ui/gl/gl.gyp:gl', + 'command_buffer/command_buffer.gyp:gles2_utils', + 'gles2_cmd_helper', + ], + 'all_dependent_settings': { + 'include_dirs': [ + # For GLES2/gl2.h + '<(DEPTH)/third_party/khronos', + ], + }, + 'defines': [ + 'GLES2_IMPL_IMPLEMENTATION', + ], + 'sources': [ + '<@(gles2_implementation_source_files)', + ], + }, + { + # Library emulates GLES2 using command_buffers. + 'target_name': 'gles2_implementation_client_side_arrays', + 'type': '<(component)', + 'defines': [ + 'GLES2_IMPL_IMPLEMENTATION', + 'GLES2_SUPPORT_CLIENT_SIDE_ARRAYS=1', + ], + 'dependencies': [ + '../base/base.gyp:base', + '../ui/gl/gl.gyp:gl', + 'command_buffer/command_buffer.gyp:gles2_utils', + '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': '<(component)', + 'defines': [ + 'GLES2_IMPL_IMPLEMENTATION', + 'GLES2_SUPPORT_CLIENT_SIDE_ARRAYS=1', + 'GLES2_CONFORMANCE_TESTS=1', + ], + 'dependencies': [ + '../base/base.gyp:base', + 'command_buffer/command_buffer.gyp:gles2_utils', + 'gles2_cmd_helper', + ], + 'all_dependent_settings': { + 'include_dirs': [ + # For GLES2/gl2.h + '<(DEPTH)/third_party/khronos', + ], + }, + 'sources': [ + '<@(gles2_implementation_source_files)', + ], + }, + { + # Stub to expose gles2_implemenation in C instead of C++. + # so GLES2 C programs can work with no changes. + 'target_name': 'gles2_c_lib', + 'type': '<(component)', + 'dependencies': [ + '../base/base.gyp:base', + '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + 'command_buffer/command_buffer.gyp:gles2_utils', + 'command_buffer_client', + 'gles2_implementation', + ], + 'defines': [ + 'GLES2_C_LIB_IMPLEMENTATION', + ], + 'sources': [ + '<@(gles2_c_lib_source_files)', + ], + }, + { + # Same as gles2_c_lib except with no parameter checking. Required for + # OpenGL ES 2.0 conformance tests. + 'target_name': 'gles2_c_lib_nocheck', + 'type': '<(component)', + 'defines': [ + 'GLES2_C_LIB_IMPLEMENTATION', + 'GLES2_CONFORMANCE_TESTS=1', + ], + 'dependencies': [ + '../base/base.gyp:base', + '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + 'command_buffer/command_buffer.gyp:gles2_utils', + 'command_buffer_client', + 'gles2_implementation_client_side_arrays_no_check', + ], + 'sources': [ + '<@(gles2_c_lib_source_files)', + ], + }, + { + 'target_name': 'gpu_unittests', + 'type': '<(gtest_target_type)', + 'dependencies': [ + '../base/base.gyp:base', + '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '../testing/gmock.gyp:gmock', + '../testing/gtest.gyp:gtest', + '../third_party/angle/src/build_angle.gyp:translator_glsl', + '../ui/gl/gl.gyp:gl', + '../ui/ui.gyp:ui', + 'command_buffer/command_buffer.gyp:gles2_utils', + 'command_buffer_client', + 'command_buffer_common', + 'command_buffer_service', + 'gpu', + 'gpu_unittest_utils', + 'gles2_implementation_client_side_arrays', + 'gles2_cmd_helper', + ], + 'defines': [ + 'GLES2_C_LIB_IMPLEMENTATION', + ], + 'sources': [ + '<@(gles2_c_lib_source_files)', + 'command_buffer/client/client_test_helper.cc', + 'command_buffer/client/client_test_helper.h', + 'command_buffer/client/cmd_buffer_helper_test.cc', + 'command_buffer/client/fenced_allocator_test.cc', + 'command_buffer/client/gles2_implementation_unittest.cc', + 'command_buffer/client/mapped_memory_unittest.cc', + 'command_buffer/client/query_tracker_unittest.cc', + 'command_buffer/client/program_info_manager_unittest.cc', + 'command_buffer/client/ring_buffer_test.cc', + 'command_buffer/client/transfer_buffer_unittest.cc', + 'command_buffer/common/bitfield_helpers_test.cc', + 'command_buffer/common/command_buffer_mock.cc', + 'command_buffer/common/command_buffer_mock.h', + 'command_buffer/common/command_buffer_shared_test.cc', + 'command_buffer/common/gles2_cmd_format_test.cc', + 'command_buffer/common/gles2_cmd_format_test_autogen.h', + 'command_buffer/common/gles2_cmd_utils_unittest.cc', + 'command_buffer/common/id_allocator_test.cc', + 'command_buffer/common/trace_event.h', + 'command_buffer/common/unittest_main.cc', + 'command_buffer/service/buffer_manager_unittest.cc', + 'command_buffer/service/cmd_parser_test.cc', + 'command_buffer/service/command_buffer_service_unittest.cc', + 'command_buffer/service/common_decoder_unittest.cc', + 'command_buffer/service/context_group_unittest.cc', + 'command_buffer/service/feature_info_unittest.cc', + 'command_buffer/service/framebuffer_manager_unittest.cc', + 'command_buffer/service/gles2_cmd_decoder_unittest.cc', + 'command_buffer/service/gles2_cmd_decoder_unittest_1.cc', + 'command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h', + 'command_buffer/service/gles2_cmd_decoder_unittest_2.cc', + 'command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h', + 'command_buffer/service/gles2_cmd_decoder_unittest_3.cc', + 'command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h', + 'command_buffer/service/gles2_cmd_decoder_unittest_base.cc', + 'command_buffer/service/gles2_cmd_decoder_unittest_base.h', + 'command_buffer/service/gl_surface_mock.cc', + 'command_buffer/service/gl_surface_mock.h', + 'command_buffer/service/gpu_scheduler_unittest.cc', + 'command_buffer/service/id_manager_unittest.cc', + 'command_buffer/service/memory_program_cache_unittest.cc', + 'command_buffer/service/mocks.cc', + 'command_buffer/service/mocks.h', + 'command_buffer/service/program_manager_unittest.cc', + 'command_buffer/service/query_manager_unittest.cc', + 'command_buffer/service/renderbuffer_manager_unittest.cc', + 'command_buffer/service/program_cache_lru_helper_unittest.cc', + 'command_buffer/service/program_cache_unittest.cc', + 'command_buffer/service/shader_manager_unittest.cc', + 'command_buffer/service/shader_translator_unittest.cc', + 'command_buffer/service/stream_texture_mock.cc', + 'command_buffer/service/stream_texture_mock.h', + 'command_buffer/service/stream_texture_manager_mock.cc', + 'command_buffer/service/stream_texture_manager_mock.h', + 'command_buffer/service/test_helper.cc', + 'command_buffer/service/test_helper.h', + 'command_buffer/service/texture_manager_unittest.cc', + 'command_buffer/service/transfer_buffer_manager_unittest.cc', + 'command_buffer/service/vertex_attrib_manager_unittest.cc', + ], + 'conditions': [ + ['OS == "android" and gtest_target_type == "shared_library"', { + 'dependencies': [ + '../testing/android/native_test.gyp:native_test_native_code', + ], + }], + ], + }, + { + 'target_name': 'gl_tests', + 'type': 'executable', + 'dependencies': [ + '../base/base.gyp:base', + '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '../testing/gmock.gyp:gmock', + '../testing/gtest.gyp:gtest', + '../third_party/angle/src/build_angle.gyp:translator_glsl', + '../ui/ui.gyp:ui', + 'command_buffer/command_buffer.gyp:gles2_utils', + 'command_buffer_client', + 'command_buffer_common', + 'command_buffer_service', + 'gpu', + 'gpu_unittest_utils', + 'gles2_implementation_client_side_arrays', + 'gles2_cmd_helper', + #'gl_unittests', + ], + 'defines': [ + 'GLES2_C_LIB_IMPLEMENTATION', + 'GL_GLEXT_PROTOTYPES', + ], + 'sources': [ + '<@(gles2_c_lib_source_files)', + 'command_buffer/tests/gl_bind_uniform_location_unittest.cc', + 'command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc', + 'command_buffer/tests/gl_depth_texture_unittest.cc', + 'command_buffer/tests/gl_get_error_query_unittests.cc', + 'command_buffer/tests/gl_manager.cc', + 'command_buffer/tests/gl_manager.h', + 'command_buffer/tests/gl_pointcoord_unittest.cc', + 'command_buffer/tests/gl_tests_main.cc', + 'command_buffer/tests/gl_test_utils.cc', + 'command_buffer/tests/gl_test_utils.h', + 'command_buffer/tests/gl_texture_mailbox_unittests.cc', + 'command_buffer/tests/gl_unittests.cc', + 'command_buffer/tests/occlusion_query_unittests.cc', + ], + }, + { + 'target_name': 'gpu_unittest_utils', + 'type': 'static_library', + 'dependencies': [ + '../testing/gmock.gyp:gmock', + '../testing/gtest.gyp:gtest', + '../ui/gl/gl.gyp:gl', + ], + 'include_dirs': [ + '..', + '<(DEPTH)/third_party/khronos', + ], + 'sources': [ + 'command_buffer/common/gl_mock.h', + 'command_buffer/common/gl_mock.cc', + 'command_buffer/service/gles2_cmd_decoder_mock.cc', + 'command_buffer/service/gles2_cmd_decoder_mock.cc', + ], + }, + ], 'conditions': [ ['component=="static_library"', { 'targets': [ @@ -57,6 +294,10 @@ 'includes': [ 'command_buffer_common.gypi', ], + 'dependencies': [ + '../base/base.gyp:base', + 'command_buffer/command_buffer.gyp:gles2_utils', + ], 'export_dependent_settings': [ '../base/base.gyp:base', ], diff --git a/gpu/gpu_common.gypi b/gpu/gpu_common.gypi index 1cd742c..699863f 100644 --- a/gpu/gpu_common.gypi +++ b/gpu/gpu_common.gypi @@ -3,271 +3,34 @@ # found in the LICENSE file. { - 'targets': [ - { - # Library emulates GLES2 using command_buffers. - 'target_name': 'gles2_implementation', - 'type': '<(component)', - 'dependencies': [ - '../base/base.gyp:base', - '../ui/gl/gl.gyp:gl', - 'command_buffer/command_buffer.gyp:gles2_utils', - 'gles2_cmd_helper', - ], - 'all_dependent_settings': { - 'include_dirs': [ - # For GLES2/gl2.h - '<(DEPTH)/third_party/khronos', - ], - }, - 'defines': [ - 'GLES2_IMPL_IMPLEMENTATION', - ], - 'sources': [ - '<@(gles2_implementation_source_files)', - ], - }, - { - # Library emulates GLES2 using command_buffers. - 'target_name': 'gles2_implementation_client_side_arrays', - 'type': '<(component)', - 'defines': [ - 'GLES2_IMPL_IMPLEMENTATION', - 'GLES2_SUPPORT_CLIENT_SIDE_ARRAYS=1', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../ui/gl/gl.gyp:gl', - 'command_buffer/command_buffer.gyp:gles2_utils', - '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': '<(component)', - 'defines': [ - 'GLES2_IMPL_IMPLEMENTATION', - 'GLES2_SUPPORT_CLIENT_SIDE_ARRAYS=1', - 'GLES2_CONFORMANCE_TESTS=1', - ], - 'dependencies': [ - '../base/base.gyp:base', - 'command_buffer/command_buffer.gyp:gles2_utils', - 'gles2_cmd_helper', - ], - 'all_dependent_settings': { - 'include_dirs': [ - # For GLES2/gl2.h - '<(DEPTH)/third_party/khronos', - ], - }, - 'sources': [ - '<@(gles2_implementation_source_files)', - ], - }, - { - # Stub to expose gles2_implemenation in C instead of C++. - # so GLES2 C programs can work with no changes. - 'target_name': 'gles2_c_lib', - 'type': '<(component)', - 'dependencies': [ - '../base/base.gyp:base', - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - 'command_buffer/command_buffer.gyp:gles2_utils', - 'command_buffer_client', - 'gles2_implementation', - ], - 'defines': [ - 'GLES2_C_LIB_IMPLEMENTATION', - ], - 'sources': [ - '<@(gles2_c_lib_source_files)', - ], - }, - { - # Same as gles2_c_lib except with no parameter checking. Required for - # OpenGL ES 2.0 conformance tests. - 'target_name': 'gles2_c_lib_nocheck', - 'type': '<(component)', - 'defines': [ - 'GLES2_C_LIB_IMPLEMENTATION', - 'GLES2_CONFORMANCE_TESTS=1', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - 'command_buffer/command_buffer.gyp:gles2_utils', - 'command_buffer_client', - 'gles2_implementation_client_side_arrays_no_check', - ], - 'sources': [ - '<@(gles2_c_lib_source_files)', - ], - }, - { - 'target_name': 'gpu_unittests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - '../base/base.gyp:base', - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '../testing/gmock.gyp:gmock', - '../testing/gtest.gyp:gtest', - '../third_party/angle/src/build_angle.gyp:translator_glsl', - '../ui/gl/gl.gyp:gl', - '../ui/ui.gyp:ui', - 'command_buffer/command_buffer.gyp:gles2_utils', - 'command_buffer_client', - 'command_buffer_common', - 'command_buffer_service', - 'gpu', - 'gpu_unittest_utils', - 'gles2_implementation_client_side_arrays', - 'gles2_cmd_helper', - ], - 'defines': [ - 'GLES2_C_LIB_IMPLEMENTATION', - ], - 'sources': [ - '<@(gles2_c_lib_source_files)', - 'command_buffer/client/client_test_helper.cc', - 'command_buffer/client/client_test_helper.h', - 'command_buffer/client/cmd_buffer_helper_test.cc', - 'command_buffer/client/fenced_allocator_test.cc', - 'command_buffer/client/gles2_implementation_unittest.cc', - 'command_buffer/client/mapped_memory_unittest.cc', - 'command_buffer/client/query_tracker_unittest.cc', - 'command_buffer/client/program_info_manager_unittest.cc', - 'command_buffer/client/ring_buffer_test.cc', - 'command_buffer/client/transfer_buffer_unittest.cc', - 'command_buffer/common/bitfield_helpers_test.cc', - 'command_buffer/common/command_buffer_mock.cc', - 'command_buffer/common/command_buffer_mock.h', - 'command_buffer/common/command_buffer_shared_test.cc', - 'command_buffer/common/gles2_cmd_format_test.cc', - 'command_buffer/common/gles2_cmd_format_test_autogen.h', - 'command_buffer/common/gles2_cmd_utils_unittest.cc', - 'command_buffer/common/id_allocator_test.cc', - 'command_buffer/common/trace_event.h', - 'command_buffer/common/unittest_main.cc', - 'command_buffer/service/buffer_manager_unittest.cc', - 'command_buffer/service/cmd_parser_test.cc', - 'command_buffer/service/command_buffer_service_unittest.cc', - 'command_buffer/service/common_decoder_unittest.cc', - 'command_buffer/service/context_group_unittest.cc', - 'command_buffer/service/feature_info_unittest.cc', - 'command_buffer/service/framebuffer_manager_unittest.cc', - 'command_buffer/service/gles2_cmd_decoder_unittest.cc', - 'command_buffer/service/gles2_cmd_decoder_unittest_1.cc', - 'command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h', - 'command_buffer/service/gles2_cmd_decoder_unittest_2.cc', - 'command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h', - 'command_buffer/service/gles2_cmd_decoder_unittest_3.cc', - 'command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h', - 'command_buffer/service/gles2_cmd_decoder_unittest_base.cc', - 'command_buffer/service/gles2_cmd_decoder_unittest_base.h', - 'command_buffer/service/gl_surface_mock.cc', - 'command_buffer/service/gl_surface_mock.h', - 'command_buffer/service/gpu_scheduler_unittest.cc', - 'command_buffer/service/id_manager_unittest.cc', - 'command_buffer/service/memory_program_cache_unittest.cc', - 'command_buffer/service/mocks.cc', - 'command_buffer/service/mocks.h', - 'command_buffer/service/program_manager_unittest.cc', - 'command_buffer/service/query_manager_unittest.cc', - 'command_buffer/service/renderbuffer_manager_unittest.cc', - 'command_buffer/service/program_cache_lru_helper_unittest.cc', - 'command_buffer/service/program_cache_unittest.cc', - 'command_buffer/service/shader_manager_unittest.cc', - 'command_buffer/service/shader_translator_unittest.cc', - 'command_buffer/service/stream_texture_mock.cc', - 'command_buffer/service/stream_texture_mock.h', - 'command_buffer/service/stream_texture_manager_mock.cc', - 'command_buffer/service/stream_texture_manager_mock.h', - 'command_buffer/service/test_helper.cc', - 'command_buffer/service/test_helper.h', - 'command_buffer/service/texture_manager_unittest.cc', - 'command_buffer/service/transfer_buffer_manager_unittest.cc', - 'command_buffer/service/vertex_attrib_manager_unittest.cc', - ], - 'conditions': [ - ['OS == "android" and gtest_target_type == "shared_library"', { - 'dependencies': [ - '../testing/android/native_test.gyp:native_test_native_code', - ], - }], - ], - }, - { - 'target_name': 'gl_tests', - 'type': 'executable', - 'dependencies': [ - '../base/base.gyp:base', - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '../testing/gmock.gyp:gmock', - '../testing/gtest.gyp:gtest', - '../third_party/angle/src/build_angle.gyp:translator_glsl', - '../ui/ui.gyp:ui', - 'command_buffer/command_buffer.gyp:gles2_utils', - 'command_buffer_client', - 'command_buffer_common', - 'command_buffer_service', - 'gpu', - 'gpu_unittest_utils', - 'gles2_implementation_client_side_arrays', - 'gles2_cmd_helper', - #'gl_unittests', - ], - 'defines': [ - 'GLES2_C_LIB_IMPLEMENTATION', - 'GL_GLEXT_PROTOTYPES', - ], - 'sources': [ - '<@(gles2_c_lib_source_files)', - 'command_buffer/tests/gl_bind_uniform_location_unittest.cc', - 'command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc', - 'command_buffer/tests/gl_depth_texture_unittest.cc', - 'command_buffer/tests/gl_get_error_query_unittests.cc', - 'command_buffer/tests/gl_manager.cc', - 'command_buffer/tests/gl_manager.h', - 'command_buffer/tests/gl_pointcoord_unittest.cc', - 'command_buffer/tests/gl_tests_main.cc', - 'command_buffer/tests/gl_test_utils.cc', - 'command_buffer/tests/gl_test_utils.h', - 'command_buffer/tests/gl_texture_mailbox_unittests.cc', - 'command_buffer/tests/gl_unittests.cc', - 'command_buffer/tests/occlusion_query_unittests.cc', - ], - }, - { - 'target_name': 'gpu_unittest_utils', - 'type': 'static_library', - 'dependencies': [ - '../testing/gmock.gyp:gmock', - '../testing/gtest.gyp:gtest', - '../ui/gl/gl.gyp:gl', - ], - 'include_dirs': [ - '..', - '<(DEPTH)/third_party/khronos', - ], - 'sources': [ - 'command_buffer/common/gl_mock.h', - 'command_buffer/common/gl_mock.cc', - 'command_buffer/service/gles2_cmd_decoder_mock.cc', - 'command_buffer/service/gles2_cmd_decoder_mock.cc', - ], - }, - ], + 'variables': { + 'chromium_code': 1, + # These are defined here because we need to build this library twice. Once + # with extra parameter checking. Once with no parameter checking to be 100% + # OpenGL ES 2.0 compliant for the conformance tests. + 'gles2_c_lib_source_files': [ + 'command_buffer/client/gles2_c_lib.cc', + 'command_buffer/client/gles2_c_lib_autogen.h', + 'command_buffer/client/gles2_c_lib_export.h', + 'command_buffer/client/gles2_lib.h', + 'command_buffer/client/gles2_lib.cc', + ], + # These are defined here because we need to build this library twice. Once + # with without support for client side arrays and once with for pepper and + # the OpenGL ES 2.0 compliant for the conformance tests. + 'gles2_implementation_source_files': [ + 'command_buffer/client/gles2_impl_export.h', + 'command_buffer/client/gles2_implementation_autogen.h', + 'command_buffer/client/gles2_implementation.cc', + 'command_buffer/client/gles2_implementation.h', + 'command_buffer/client/program_info_manager.cc', + 'command_buffer/client/program_info_manager.h', + 'command_buffer/client/query_tracker.cc', + 'command_buffer/client/query_tracker.h', + 'command_buffer/client/share_group.cc', + 'command_buffer/client/share_group.h', + ] + }, 'conditions': [ # Special target to wrap a gtest_target_type==shared_library # gpu_unittests into an android apk for execution. diff --git a/gpu/gpu_untrusted.gyp b/gpu/gpu_untrusted.gyp new file mode 100644 index 0000000..33abfcd --- /dev/null +++ b/gpu/gpu_untrusted.gyp @@ -0,0 +1,116 @@ +# Copyright (c) 2012 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, + }, + 'includes': [ + '../native_client/build/untrusted.gypi', + 'gpu_common.gypi', + ], + 'conditions': [ + ['disable_nacl==0 and disable_nacl_untrusted==0', { + 'targets': [ + { + 'target_name': 'gles2_implementation_untrusted', + 'type': 'none', + 'variables': { + 'nacl_untrusted_build': 1, + 'nlib_target': 'libgles2_implementation_untrusted.a', + 'build_glibc': 0, + 'build_newlib': 1, + }, + 'defines': [ + 'GLES2_IMPL_IMPLEMENTATION', + ], + 'include_dirs': [ + '../third_party/khronos', + ], + 'sources': [ + '<@(gles2_implementation_source_files)', + ], + 'dependencies': [ + '../native_client/tools.gyp:prep_toolchain', + '../base/base_untrusted.gyp:base_untrusted', + 'command_buffer/command_buffer_untrusted.gyp:gles2_utils_untrusted', + 'gles2_cmd_helper_untrusted', + ], + }, + { + 'target_name': 'command_buffer_common_untrusted', + 'type': 'none', + 'variables': { + 'nacl_untrusted_build': 1, + 'nlib_target': 'libcommand_buffer_common_untrusted.a', + 'build_glibc': 0, + 'build_newlib': 1, + }, + 'includes': [ + 'command_buffer_common.gypi', + ], + 'dependencies': [ + '../native_client/tools.gyp:prep_toolchain', + '../base/base_untrusted.gyp:base_untrusted', + 'command_buffer/command_buffer_untrusted.gyp:gles2_utils_untrusted', + ], + }, + { + 'target_name': 'gles2_cmd_helper_untrusted', + 'type': 'none', + 'variables': { + 'nacl_untrusted_build': 1, + 'nlib_target': 'libgles2_cmd_helper_untrusted.a', + 'build_glibc': 0, + 'build_newlib': 1, + }, + 'includes': [ + 'gles2_cmd_helper.gypi', + ], + 'dependencies': [ + '../native_client/tools.gyp:prep_toolchain', + '../base/base_untrusted.gyp:base_untrusted', + 'command_buffer_client_untrusted', + ], + }, + { + 'target_name': 'command_buffer_client_untrusted', + 'type': 'none', + 'variables': { + 'nacl_untrusted_build': 1, + 'nlib_target': 'libcommand_buffer_client_untrusted.a', + 'build_glibc': 0, + 'build_newlib': 1, + }, + 'includes': [ + 'command_buffer_client.gypi', + ], + 'dependencies': [ + '../native_client/tools.gyp:prep_toolchain', + '../base/base_untrusted.gyp:base_untrusted', + 'command_buffer_common_untrusted', + ], + }, + { + 'target_name': 'gpu_ipc_untrusted', + 'type': 'none', + 'variables': { + 'nacl_untrusted_build': 1, + 'nlib_target': 'libgpu_ipc_untrusted.a', + 'build_glibc': 0, + 'build_newlib': 1, + }, + 'includes': [ + 'gpu_ipc.gypi', + ], + 'dependencies': [ + '../native_client/tools.gyp:prep_toolchain', + '../base/base_untrusted.gyp:base_untrusted', + 'command_buffer_common_untrusted', + ], + }, + ], + }], + ], +} |