summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-05 01:54:06 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-05 01:54:06 +0000
commita9a430111290193028dc2b39be75c176d49d7bd3 (patch)
tree4b28a94aed9596ff8bcaf5f67b1e9273ece1c40f /ppapi
parent0f8805d56674fff8ef79abd0981a3ede8b79190d (diff)
downloadchromium_src-a9a430111290193028dc2b39be75c176d49d7bd3.zip
chromium_src-a9a430111290193028dc2b39be75c176d49d7bd3.tar.gz
chromium_src-a9a430111290193028dc2b39be75c176d49d7bd3.tar.bz2
Revert 65152 - 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 TBR=apatrick@chromium.org Review URL: http://codereview.chromium.org/4561001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65169 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/cpp/instance.cc7
-rw-r--r--ppapi/cpp/instance.h4
2 files changed, 0 insertions, 11 deletions
diff --git a/ppapi/cpp/instance.cc b/ppapi/cpp/instance.cc
index 16cc274..16d7f76 100644
--- a/ppapi/cpp/instance.cc
+++ b/ppapi/cpp/instance.cc
@@ -6,7 +6,6 @@
#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"
@@ -87,12 +86,6 @@ 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;
diff --git a/ppapi/cpp/instance.h b/ppapi/cpp/instance.h
index e0a5889..df09bb9 100644
--- a/ppapi/cpp/instance.h
+++ b/ppapi/cpp/instance.h
@@ -27,7 +27,6 @@ struct PP_InputEvent;
namespace pp {
class Graphics2D;
-class Graphics3D_Dev;
class ImageData;
class Point;
class Rect;
@@ -90,9 +89,6 @@ class Instance {
/** See PPB_Instance.BindGraphics. */
bool BindGraphics(const Graphics2D& graphics);
- /** See PPB_Instance.BindGraphics. */
- bool BindGraphics(const Graphics3D_Dev& graphics);
-
/** See PPB_Instance.IsFullFrame. */
bool IsFullFrame();