diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-22 23:28:15 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-22 23:28:15 +0000 |
| commit | 7477ea6f6a173b586622fd276433a346760ffbf4 (patch) | |
| tree | 678229a49ae5c4bb1a54a61374466cdddf57db59 /gpu/gpu.gyp | |
| parent | e4f7cec0a45a803faf00875a070090b165ff1fc5 (diff) | |
| download | chromium_src-7477ea6f6a173b586622fd276433a346760ffbf4.zip chromium_src-7477ea6f6a173b586622fd276433a346760ffbf4.tar.gz chromium_src-7477ea6f6a173b586622fd276433a346760ffbf4.tar.bz2 | |
Added Pepper 3D device that instantiates the GPU plugin and sends GLES2 commands to it via a command buffer.
Added API for managing buffers to Pepper 3D device.
Removed DCHECK from WebPluginImpl::SetWindow that checks against a windowless plugin being given a window handle. Please check this! Now an initially windowless plugin instance gets a handle when it requests a Pepper 3D context. Perhaps the window handle should be concealed from the underlying plugin isntance.
Removed enable_gpu gyp variable and C macro. GPU code is always built on windows but not mac or linux. It is enabled at runtime with the --enable-gpu-plugin switch.
Redesigned CommandBuffer interface so it exposes shared memory through a Buffer. This was necessary because Pepper has no notion of shared memory handles. The Buffer exposes the shared memory as both a handle (through base::SharedMemory) and the mapped address and size.
Refactored CommandBufferEngine so mapped shared memory addresses and sizes are returned with a single call rather than two separate calls.
Added 3D demo to pepper test plugin.
TEST=try servers
BUG=none
Review URL: http://codereview.chromium.org/367002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35185 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
| -rw-r--r-- | gpu/gpu.gyp | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 5a5c113..d4de4c5 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -85,6 +85,7 @@ ], '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', @@ -278,7 +279,7 @@ }, { 'target_name': 'gpu_plugin', - 'type': '<(library)', + 'type': 'static_library', 'dependencies': [ '../base/base.gyp:base', 'command_buffer_service', @@ -312,24 +313,40 @@ ], }, { - 'target_name': 'gles2_demo', - 'type': 'executable', + 'target_name': 'gles2_demo_lib', + 'type': 'static_library', 'dependencies': [ 'command_buffer_client', - 'command_buffer_service', 'gles2_lib', 'gles2_c_lib', - 'gpu_plugin', ], 'sources': [ - 'command_buffer/client/gles2_demo.cc', 'command_buffer/client/gles2_demo_c.h', 'command_buffer/client/gles2_demo_c.c', 'command_buffer/client/gles2_demo_cc.h', 'command_buffer/client/gles2_demo_cc.cc', ], }, - ] + ], + 'conditions': [ + ['OS == "win"', + { + 'targets': [ + { + 'target_name': 'gles2_demo', + 'type': 'executable', + 'dependencies': [ + 'command_buffer_service', + 'gles2_demo_lib', + ], + 'sources': [ + 'command_buffer/client/gles2_demo.cc', + ], + }, + ], + }, + ], + ], } # Local Variables: |