diff options
| author | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-24 01:52:12 +0000 |
|---|---|---|
| committer | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-24 01:52:12 +0000 |
| commit | 7fb32637bd9968a4c4c9e1d0a08e9b3501b0f7f8 (patch) | |
| tree | 38a288386b393778daf3c10f468303a78caa662c /o3d/plugin/mac | |
| parent | 4e95d20901a74570052740441f2ec8290c7d8d77 (diff) | |
| download | chromium_src-7fb32637bd9968a4c4c9e1d0a08e9b3501b0f7f8.zip chromium_src-7fb32637bd9968a4c4c9e1d0a08e9b3501b0f7f8.tar.gz chromium_src-7fb32637bd9968a4c4c9e1d0a08e9b3501b0f7f8.tar.bz2 | |
Ported the Loop/Blinn shaders in samples/o3djs/gpu2d.js to GLSL to add
antialiasing support. Fixed build problems in GLES2 backend on Mac OS X.
Tested updated gpu2d.js in Cg and GLSL versions of plugin. Note that
multisampling must be turned on in order for the antialiasing to look
good, and in particular O3D's Core Graphics and Core Animation
backends on Mac OS X do not currently support this.
BUG=none
TEST=none
TBR=apatrick,gman
Review URL: http://codereview.chromium.org/2883038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53564 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin/mac')
| -rw-r--r-- | o3d/plugin/mac/plugin_mac.mm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/o3d/plugin/mac/plugin_mac.mm b/o3d/plugin/mac/plugin_mac.mm index 66b8ba6..58195a2 100644 --- a/o3d/plugin/mac/plugin_mac.mm +++ b/o3d/plugin/mac/plugin_mac.mm @@ -687,7 +687,11 @@ void PluginObject::CleanupFullscreenOpenGLContext() { void PluginObject::SetMacCGLContext(CGLContextObj context) { mac_cgl_context_ = context; if (renderer_) { +#ifdef RENDERER_GLES2 + ((o3d::RendererGLES2*) renderer_)->set_mac_cgl_context(context); +#else ((o3d::RendererGL*) renderer_)->set_mac_cgl_context(context); +#endif } } |