Move PPAPI graphics3d and opengles interfaces out of Dev.

ppapi/examples/gles2/gles2.cc

 // Copyright (c) 2011 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 <string.h>
 
 #include <iostream>
 #include <sstream>
 #include <list>
 #include <map>
 #include <set>
 #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"
 #include "ppapi/cpp/var.h"
 #include "ppapi/examples/gles2/testdata.h"
 #include "ppapi/lib/gl/include/GLES2/gl2.h"
 
 // Use assert as a poor-man's CHECK, even in non-debug mode.
 // Since <assert.h> redefines assert on every inclusion (it doesn't use
 // include-guards), make sure this is the last file #include'd in this file.
 #undef NDEBUG
 #include <assert.h>
 
 // Assert |context_| isn't holding any GL Errors.  Done as a macro instead of a
 // function to preserve line number information in the failure message.
 #define assertNoGLError() \
   assert(!gles2_if_->GetError(context_->pp_resource()));
 
 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);
   virtual ~GLES2DemoInstance();
 
   // pp::Instance implementation (see PPP_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.
     // Probably have to recreate the decoder from scratch, because old textures
     // can still be outstanding in the decoder!
     assert(!"Unexpectedly lost graphics context");
   }
 
   // pp::VideoDecoderClient_Dev implementation.
   virtual void ProvidePictureBuffers(PP_Resource decoder,
@@ skipping 87 matching lines @@
   std::list<std::pair<PP_Resource, PP_Picture_Dev> > pictures_pending_paint_;
   int num_frames_rendered_;
   PP_TimeTicks first_frame_delivered_ticks_;
   PP_TimeTicks last_swap_request_ticks_;
   PP_TimeTicks swap_ticks_;
   pp::CompletionCallbackFactory<GLES2DemoInstance> callback_factory_;
 
   // 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_;
   pp::Surface3D_Dev* surface_;
   typedef std::map<int, DecoderClient*> Decoders;
   Decoders video_decoders_;
 };
 
 GLES2DemoInstance::DecoderClient::DecoderClient(GLES2DemoInstance* gles2,
                                               pp::VideoDecoder_Dev* decoder)
@@ skipping 13 matching lines @@
   bitstream_buffers_by_id_.clear();
 
   for (PictureBufferMap::iterator it = picture_buffers_by_id_.begin();
        it != picture_buffers_by_id_.end(); ++it) {
     gles2_->DeleteTexture(it->second.texture_id);
   }
   picture_buffers_by_id_.clear();
 }
 
 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),
       swap_ticks_(0),
       callback_factory_(this),
       context_(NULL),
       surface_(NULL) {
   assert((console_if_ = static_cast<const struct PPB_Console_Dev*>(
       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() {
   for (Decoders::iterator it = video_decoders_.begin();
        it != video_decoders_.end(); ++it) {
     delete it->second;
   }
   video_decoders_.clear();
   delete surface_;
   delete context_;
@@ skipping 358 matching lines @@
   gles2_if_->DeleteShader(context_->pp_resource(), shader);
 }
 }  // anonymous namespace
 
 namespace pp {
 // Factory function for your specialization of the Module object.
 Module* CreateModule() {
   return new GLES2DemoModule();
 }
 }  // namespace pp