| Index: gpu/gpu.gyp
|
| ===================================================================
|
| --- gpu/gpu.gyp (revision 121956)
|
| +++ gpu/gpu.gyp (working copy)
|
| @@ -30,71 +30,34 @@
|
| {
|
| 'target_name': 'command_buffer_common',
|
| 'type': 'static_library',
|
| - 'include_dirs': [
|
| - '<(DEPTH)/third_party/khronos',
|
| + 'includes': [
|
| + 'command_buffer_common.gypi',
|
| ],
|
| - 'all_dependent_settings': {
|
| - 'include_dirs': [
|
| - '<(DEPTH)/third_party/khronos',
|
| - ],
|
| - },
|
| - 'dependencies': [
|
| - '../base/base.gyp:base',
|
| - 'command_buffer/command_buffer.gyp:gles2_utils',
|
| - ],
|
| 'export_dependent_settings': [
|
| '../base/base.gyp:base',
|
| ],
|
| - 'sources': [
|
| - 'command_buffer/common/bitfield_helpers.h',
|
| - 'command_buffer/common/buffer.h',
|
| - 'command_buffer/common/cmd_buffer_common.h',
|
| - 'command_buffer/common/cmd_buffer_common.cc',
|
| - 'command_buffer/common/command_buffer.h',
|
| - 'command_buffer/common/compiler_specific.h',
|
| - 'command_buffer/common/constants.h',
|
| - 'command_buffer/common/gles2_cmd_ids_autogen.h',
|
| - 'command_buffer/common/gles2_cmd_ids.h',
|
| - '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/id_allocator.cc',
|
| - 'command_buffer/common/id_allocator.h',
|
| - 'command_buffer/common/thread_local.h',
|
| - 'command_buffer/common/types.h',
|
| - ],
|
| },
|
| {
|
| # Library helps make GLES2 command buffers.
|
| 'target_name': 'gles2_cmd_helper',
|
| 'type': 'static_library',
|
| + 'includes': [
|
| + 'gles2_cmd_helper.gypi',
|
| + ],
|
| 'dependencies': [
|
| 'command_buffer_client',
|
| ],
|
| - 'sources': [
|
| - 'command_buffer/client/gles2_cmd_helper.cc',
|
| - 'command_buffer/client/gles2_cmd_helper.h',
|
| - 'command_buffer/client/gles2_cmd_helper_autogen.h',
|
| - ],
|
| },
|
| {
|
| # Library emulates GLES2 using command_buffers.
|
| 'target_name': 'gles2_implementation',
|
| 'type': 'static_library',
|
| + 'includes': [
|
| + 'gles2_implementation.gypi',
|
| + ],
|
| 'dependencies': [
|
| - '../base/base.gyp:base',
|
| - '../ui/gfx/gl/gl.gyp:gl',
|
| '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.
|
| @@ -177,112 +140,22 @@
|
| {
|
| 'target_name': 'command_buffer_client',
|
| 'type': 'static_library',
|
| - 'include_dirs': [
|
| - '..',
|
| - '<(DEPTH)/third_party/khronos',
|
| + 'includes': [
|
| + 'command_buffer_client.gypi',
|
| ],
|
| - 'all_dependent_settings': {
|
| - 'include_dirs': [
|
| - '..',
|
| - '<(DEPTH)/third_party/khronos',
|
| - ],
|
| - },
|
| 'dependencies': [
|
| 'command_buffer_common',
|
| ],
|
| - 'sources': [
|
| - 'command_buffer/client/cmd_buffer_helper.cc',
|
| - 'command_buffer/client/cmd_buffer_helper.h',
|
| - 'command_buffer/client/fenced_allocator.cc',
|
| - 'command_buffer/client/fenced_allocator.h',
|
| - 'command_buffer/client/mapped_memory.cc',
|
| - 'command_buffer/client/mapped_memory.h',
|
| - 'command_buffer/client/ring_buffer.cc',
|
| - 'command_buffer/client/ring_buffer.h',
|
| - 'command_buffer/client/transfer_buffer.cc',
|
| - 'command_buffer/client/transfer_buffer.h',
|
| - ],
|
| },
|
| {
|
| 'target_name': 'command_buffer_service',
|
| 'type': 'static_library',
|
| - 'include_dirs': [
|
| - '..',
|
| - '<(DEPTH)/third_party/khronos',
|
| + 'includes': [
|
| + 'command_buffer_service.gypi',
|
| ],
|
| - 'all_dependent_settings': {
|
| - 'include_dirs': [
|
| - '..',
|
| - '<(DEPTH)/third_party/khronos',
|
| - ],
|
| - },
|
| 'dependencies': [
|
| 'command_buffer_common',
|
| - '../base/base.gyp:base',
|
| - '../ui/gfx/gl/gl.gyp:gl',
|
| - '../ui/gfx/surface/surface.gyp:surface',
|
| - '../ui/ui.gyp:ui',
|
| - '../third_party/angle/src/build_angle.gyp:translator_glsl',
|
| ],
|
| - 'sources': [
|
| - 'command_buffer/service/buffer_manager.h',
|
| - 'command_buffer/service/buffer_manager.cc',
|
| - 'command_buffer/service/framebuffer_manager.h',
|
| - 'command_buffer/service/framebuffer_manager.cc',
|
| - 'command_buffer/service/cmd_buffer_engine.h',
|
| - 'command_buffer/service/cmd_parser.cc',
|
| - 'command_buffer/service/cmd_parser.h',
|
| - 'command_buffer/service/command_buffer_service.cc',
|
| - 'command_buffer/service/command_buffer_service.h',
|
| - 'command_buffer/service/common_decoder.cc',
|
| - 'command_buffer/service/common_decoder.h',
|
| - 'command_buffer/service/context_group.h',
|
| - 'command_buffer/service/context_group.cc',
|
| - 'command_buffer/service/feature_info.h',
|
| - 'command_buffer/service/feature_info.cc',
|
| - 'command_buffer/service/gles2_cmd_decoder.h',
|
| - 'command_buffer/service/gles2_cmd_decoder_autogen.h',
|
| - 'command_buffer/service/gles2_cmd_decoder.cc',
|
| - 'command_buffer/service/gles2_cmd_validation.h',
|
| - 'command_buffer/service/gles2_cmd_validation.cc',
|
| - 'command_buffer/service/gles2_cmd_validation_autogen.h',
|
| - 'command_buffer/service/gles2_cmd_validation_implementation_autogen.h',
|
| - 'command_buffer/service/gl_utils.h',
|
| - 'command_buffer/service/gpu_scheduler.h',
|
| - 'command_buffer/service/gpu_scheduler.cc',
|
| - 'command_buffer/service/gpu_scheduler_mock.h',
|
| - 'command_buffer/service/gpu_switches.h',
|
| - 'command_buffer/service/gpu_switches.cc',
|
| - 'command_buffer/service/id_manager.h',
|
| - 'command_buffer/service/id_manager.cc',
|
| - 'command_buffer/service/mocks.h',
|
| - 'command_buffer/service/program_manager.h',
|
| - 'command_buffer/service/program_manager.cc',
|
| - 'command_buffer/service/renderbuffer_manager.h',
|
| - 'command_buffer/service/renderbuffer_manager.cc',
|
| - 'command_buffer/service/shader_manager.h',
|
| - 'command_buffer/service/shader_manager.cc',
|
| - 'command_buffer/service/shader_translator.h',
|
| - 'command_buffer/service/shader_translator.cc',
|
| - 'command_buffer/service/stream_texture.h',
|
| - 'command_buffer/service/stream_texture_manager.h',
|
| - 'command_buffer/service/texture_manager.h',
|
| - 'command_buffer/service/texture_manager.cc',
|
| - 'command_buffer/service/vertex_attrib_manager.h',
|
| - 'command_buffer/service/vertex_attrib_manager.cc',
|
| - ],
|
| - 'conditions': [
|
| - ['toolkit_uses_gtk == 1', {
|
| - 'dependencies': [
|
| - '../build/linux/system.gyp:gtk',
|
| - ],
|
| - }],
|
| - ['ui_compositor_image_transport==1', {
|
| - 'include_dirs': [
|
| - '<(DEPTH)/third_party/angle/include',
|
| - ],
|
| - }],
|
| - ],
|
| },
|
| {
|
| 'target_name': 'gpu_unittests',
|
| @@ -378,19 +251,12 @@
|
| {
|
| 'target_name': 'gpu_ipc',
|
| 'type': 'static_library',
|
| + 'includes': [
|
| + 'gpu_ipc.gypi',
|
| + ],
|
| 'dependencies': [
|
| 'command_buffer_client',
|
| - 'gles2_c_lib',
|
| - '../base/base.gyp:base',
|
| ],
|
| - 'include_dirs': [
|
| - '..',
|
| - '<(DEPTH)/third_party/khronos',
|
| - ],
|
| - 'sources': [
|
| - 'ipc/gpu_command_buffer_traits.cc',
|
| - 'ipc/gpu_command_buffer_traits.h',
|
| - ],
|
| },
|
| ],
|
| }
|
|
|