diff options
| author | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-03 02:28:48 +0000 |
|---|---|---|
| committer | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-03 02:28:48 +0000 |
| commit | 43f28f83bc268dea720843a2616058b64b3e8810 (patch) | |
| tree | 3c3c4fc9c43dad15246fae82cb5b965e6b217281 /gpu/gpu_plugin | |
| parent | 2d48004e1f2c8cecd015144c179f993d883aba9c (diff) | |
| download | chromium_src-43f28f83bc268dea720843a2616058b64b3e8810.zip chromium_src-43f28f83bc268dea720843a2616058b64b3e8810.tar.gz chromium_src-43f28f83bc268dea720843a2616058b64b3e8810.tar.bz2 | |
[GPU] Get GPU process running on the mac
Initial port of GPU process / plugin to Mac OS X. Uses new IOSurface
APIs and therefore currently runs only on 10.6. Alternate strategy
will need to be devised for 10.5.
Slight UI issues remain such as GPU plugins initially showing up in
the wrong place on the page. These will be fixed in follow-on bugs.
Minimal changes made to command buffer code to get it to compile on
Mac OS X. Commented out use of nested anonymous namespaces in
gles2_cmd_decoder.cc which were causing the linker to crash with a seg
fault.
Refactored gyp files so the OS test enabling the GPU plugin is in one
place, common.gypi, and other files test only the variable enable_gpu.
Slight change to gles2_demo_cc.cc to add some simple animation to
verify that updates from the GPU plugin are reaching the screen.
Changed Pepper test plugin to use 3D view by default and commented out
use of audio context because of recent issues.
TEST=none (ran Pepper Test Plugin with 3D view enabled)
BUG=http://crbug.com/25988
Review URL: http://codereview.chromium.org/558035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37934 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu_plugin')
| -rw-r--r-- | gpu/gpu_plugin/gpu_plugin.cc | 4 | ||||
| -rw-r--r-- | gpu/gpu_plugin/gpu_plugin.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gpu/gpu_plugin/gpu_plugin.cc b/gpu/gpu_plugin/gpu_plugin.cc index 5bccbe4..d274936 100644 --- a/gpu/gpu_plugin/gpu_plugin.cc +++ b/gpu/gpu_plugin/gpu_plugin.cc @@ -120,7 +120,7 @@ NPError API_CALL NP_GetEntryPoints(NPPluginFuncs* funcs) { return NPERR_NO_ERROR; } -#if defined(OS_LINUX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) NPError API_CALL NP_Initialize(NPNetscapeFuncs *browser_funcs, NPPluginFuncs* plugin_funcs) { #else @@ -129,7 +129,7 @@ NPError API_CALL NP_Initialize(NPNetscapeFuncs *browser_funcs) { if (!browser_funcs) return NPERR_INVALID_FUNCTABLE_ERROR; -#if defined(OS_LINUX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) NP_GetEntryPoints(plugin_funcs); #endif diff --git a/gpu/gpu_plugin/gpu_plugin.h b/gpu/gpu_plugin/gpu_plugin.h index b6bfc89..b973d7cf 100644 --- a/gpu/gpu_plugin/gpu_plugin.h +++ b/gpu/gpu_plugin/gpu_plugin.h @@ -17,7 +17,7 @@ namespace gpu_plugin { NPError API_CALL NP_GetEntryPoints(NPPluginFuncs* funcs); -#if defined(OS_LINUX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) NPError API_CALL NP_Initialize(NPNetscapeFuncs *browser_funcs, NPPluginFuncs* plugin_funcs); #else |