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 /chrome/chrome_renderer.gypi | |
| 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 'chrome/chrome_renderer.gypi')
| -rwxr-xr-x | chrome/chrome_renderer.gypi | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index a0c8e09..d9cc809 100755 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -148,15 +148,6 @@ ], }, 'conditions': [ - ['enable_gpu==1', { - 'dependencies': [ - '../gpu/gpu.gyp:gpu_plugin', - ], - 'sources': [ - 'renderer/command_buffer_proxy.cc', - 'renderer/command_buffer_proxy.h', - ], - }], ['disable_nacl!=1', { 'dependencies': [ 'nacl', @@ -174,6 +165,10 @@ 'include_dirs': [ 'third_party/wtl/include', ], + 'sources': [ + 'renderer/command_buffer_proxy.cc', + 'renderer/command_buffer_proxy.h', + ], 'conditions': [ ['win_use_allocator_shim==1', { 'dependencies': [ |