summaryrefslogtreecommitdiffstats
path: root/ppapi/cpp/instance.cc
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-05 00:36:12 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-05 00:36:12 +0000
commitc4cacf1429f06bac025d8c0337c3b80efa8f98a9 (patch)
tree413e05bba0fe58c7b85aea19d2391ee185257fd0 /ppapi/cpp/instance.cc
parentfc24838c909913960402b1c75926e9372af595b8 (diff)
downloadchromium_src-c4cacf1429f06bac025d8c0337c3b80efa8f98a9.zip
chromium_src-c4cacf1429f06bac025d8c0337c3b80efa8f98a9.tar.gz
chromium_src-c4cacf1429f06bac025d8c0337c3b80efa8f98a9.tar.bz2
Integrated Pepper3D v2 with the accelerated compositor.
- It now uses GGL instead of a child window. - Fixed a bug where GLES2 decoder set texture state without updating TextureInfo. - Fixed Pepper3D demos and added awesome 3D CSS programmer art. - Removed ggl::GetCurrentContext to prevent further abuse. Fixed said abuse :) - GGL exposes GLES2Implementation to allow issue of GL calls on a particular context without making that context globally current. - Removed redundant "this context" argument from GGL SwapBuffers completion callback. - Temporarily removed context lost notification. I need to figure out the best semantics. TEST=Run Pepper3D and WebGL demos and YouTube videos on Windows and Mac. BUG=none Review URL: http://codereview.chromium.org/3531008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65152 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/cpp/instance.cc')
-rw-r--r--ppapi/cpp/instance.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/ppapi/cpp/instance.cc b/ppapi/cpp/instance.cc
index 16d7f76..16cc274 100644
--- a/ppapi/cpp/instance.cc
+++ b/ppapi/cpp/instance.cc
@@ -6,6 +6,7 @@
#include "ppapi/c/dev/ppp_printing_dev.h"
#include "ppapi/c/ppb_instance.h"
+#include "ppapi/cpp/dev/graphics_3d_dev.h"
#include "ppapi/cpp/dev/scrollbar_dev.h"
#include "ppapi/cpp/dev/widget_dev.h"
#include "ppapi/cpp/graphics_2d.h"
@@ -86,6 +87,12 @@ bool Instance::BindGraphics(const Graphics2D& graphics) {
return ppb_instance_f->BindGraphics(pp_instance(), graphics.pp_resource());
}
+bool Instance::BindGraphics(const Graphics3D_Dev& graphics) {
+ if (!ppb_instance_f)
+ return false;
+ return ppb_instance_f->BindGraphics(pp_instance(), graphics.pp_resource());
+}
+
bool Instance::IsFullFrame() {
if (!ppb_instance_f)
return false;