Added ppapi::Surface3D. This CL completes the new Pepper3D interface. The imp...

gpu/demos/framework/pepper.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <GLES2/gl2.h>
 
 #include "gpu/demos/framework/demo.h"
 #include "gpu/demos/framework/demo_factory.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/rect.h"
 #include "ppapi/cpp/size.h"
 #include "ppapi/cpp/dev/context_3d_dev.h"
 #include "ppapi/cpp/dev/graphics_3d_dev.h"
+#include "ppapi/cpp/dev/surface_3d_dev.h"
 #include "ppapi/lib/gl/gles2/gl2ext_ppapi.h"
 
 namespace gpu {
 namespace demos {
 
 class PluginInstance : public pp::Instance {
  public:
   PluginInstance(PP_Instance instance, pp::Module* module)
       : pp::Instance(instance),
         module_(module),
@@ skipping 17 matching lines @@
       return;
 
     size_ = position.size();
     demo_->InitWindowSize(size_.width(), size_.height());
 
     if (context_.is_null()) {
       context_ = pp::Context3D_Dev(*this, 0, pp::Context3D_Dev(), NULL);
       if (context_.is_null())
         return;
 
-      if (!pp::Instance::BindGraphics(context_))
-        return;
-
       glSetCurrentContextPPAPI(context_.pp_resource());
       demo_->InitGL();
       glSetCurrentContextPPAPI(0);
+    } else {
+      // Need to recreate surface. Unbind existing surface.
+      pp::Instance::BindGraphics(pp::Surface3D_Dev());
+      context_.BindSurfaces(pp::Surface3D_Dev(), pp::Surface3D_Dev());
     }
+    surface_ = pp::Surface3D_Dev(*this, 0, NULL);
+    context_.BindSurfaces(surface_, surface_);
+    pp::Instance::BindGraphics(surface_);
 
     if (demo_->IsAnimated())
       Animate(0);
     else
       Paint();
   }
 
   void Paint() {
     glSetCurrentContextPPAPI(context_.pp_resource());
     demo_->Draw();
-    context_.SwapBuffers();
+    surface_.SwapBuffers();
     glSetCurrentContextPPAPI(0);
   }
 
  private:
   void Animate(int delay) {
     Paint();
     module_->core()->CallOnMainThread(delay,
         callback_factory_.NewCallback(&PluginInstance::Animate), delay);
   }
 
   pp::Module* module_;
   Demo* demo_;
   pp::Context3D_Dev context_;
+  pp::Surface3D_Dev surface_;
   pp::Size size_;
   pp::CompletionCallbackFactory<PluginInstance> callback_factory_;
 };
 
 class PluginModule : public pp::Module {
  public:
   PluginModule() {}
   ~PluginModule() {
     glTerminatePPAPI();
   }
@@ skipping 11 matching lines @@
 }  // namespace gpu
 
 namespace pp {
 
 Module* CreateModule() {
   return new gpu::demos::PluginModule();
 }
 
 }  // namespace pp