diff options
| author | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-07 17:10:46 +0000 |
|---|---|---|
| committer | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-07 17:10:46 +0000 |
| commit | fae0e947dd72d6499abcd4cc9d8a2c988802ecc7 (patch) | |
| tree | 64894d705184fa15943381a1a083cd4a82e242a0 /ppapi/examples | |
| parent | 29ee58a0ca74da203815ffc416e0b52cafb9c79e (diff) | |
| download | chromium_src-fae0e947dd72d6499abcd4cc9d8a2c988802ecc7.zip chromium_src-fae0e947dd72d6499abcd4cc9d8a2c988802ecc7.tar.gz chromium_src-fae0e947dd72d6499abcd4cc9d8a2c988802ecc7.tar.bz2 | |
reconstitute moving 3d out of dev CL. (previous attempt was reverted)
previous CL: http://codereview.chromium.org/7737013/
BUG= http://code.google.com/p/chromium/issues/detail?id=94320
TEST= try bots, manual testing
Review URL: http://codereview.chromium.org/7837018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99968 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/examples')
| -rw-r--r-- | ppapi/examples/gles2/gles2.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ppapi/examples/gles2/gles2.cc b/ppapi/examples/gles2/gles2.cc index 26d94a4..04f31f7 100644 --- a/ppapi/examples/gles2/gles2.cc +++ b/ppapi/examples/gles2/gles2.cc @@ -12,14 +12,14 @@ #include <vector> #include "ppapi/c/dev/ppb_console_dev.h" -#include "ppapi/c/dev/ppb_opengles_dev.h" #include "ppapi/c/pp_errors.h" +#include "ppapi/c/ppb_opengles.h" #include "ppapi/cpp/dev/context_3d_dev.h" -#include "ppapi/cpp/dev/graphics_3d_client_dev.h" -#include "ppapi/cpp/dev/graphics_3d_dev.h" #include "ppapi/cpp/dev/surface_3d_dev.h" #include "ppapi/cpp/dev/video_decoder_client_dev.h" #include "ppapi/cpp/dev/video_decoder_dev.h" +#include "ppapi/cpp/graphics_3d.h" +#include "ppapi/cpp/graphics_3d_client.h" #include "ppapi/cpp/instance.h" #include "ppapi/cpp/module.h" #include "ppapi/cpp/rect.h" @@ -41,7 +41,7 @@ namespace { class GLES2DemoInstance : public pp::Instance, - public pp::Graphics3DClient_Dev, + public pp::Graphics3DClient, public pp::VideoDecoderClient_Dev { public: GLES2DemoInstance(PP_Instance instance, pp::Module* module); @@ -51,7 +51,7 @@ class GLES2DemoInstance : public pp::Instance, virtual void DidChangeView(const pp::Rect& position, const pp::Rect& clip_ignored); - // pp::Graphics3DClient_Dev implementation. + // pp::Graphics3DClient implementation. virtual void Graphics3DContextLost() { // TODO(vrk/fischman): Properly reset after a lost graphics context. In // particular need to delete context_ & surface_ and re-create textures. @@ -159,7 +159,7 @@ class GLES2DemoInstance : public pp::Instance, // Unowned pointers. const struct PPB_Console_Dev* console_if_; const struct PPB_Core* core_if_; - const struct PPB_OpenGLES2_Dev* gles2_if_; + const struct PPB_OpenGLES2* gles2_if_; // Owned data. pp::Context3D_Dev* context_; @@ -193,7 +193,7 @@ GLES2DemoInstance::DecoderClient::~DecoderClient() { } GLES2DemoInstance::GLES2DemoInstance(PP_Instance instance, pp::Module* module) - : pp::Instance(instance), pp::Graphics3DClient_Dev(this), + : pp::Instance(instance), pp::Graphics3DClient(this), pp::VideoDecoderClient_Dev(this), num_frames_rendered_(0), first_frame_delivered_ticks_(-1), @@ -205,8 +205,8 @@ GLES2DemoInstance::GLES2DemoInstance(PP_Instance instance, pp::Module* module) module->GetBrowserInterface(PPB_CONSOLE_DEV_INTERFACE)))); assert((core_if_ = static_cast<const struct PPB_Core*>( module->GetBrowserInterface(PPB_CORE_INTERFACE)))); - assert((gles2_if_ = static_cast<const struct PPB_OpenGLES2_Dev*>( - module->GetBrowserInterface(PPB_OPENGLES2_DEV_INTERFACE)))); + assert((gles2_if_ = static_cast<const struct PPB_OpenGLES2*>( + module->GetBrowserInterface(PPB_OPENGLES2_INTERFACE)))); } GLES2DemoInstance::~GLES2DemoInstance() { |