Moved the logic of maintaining the current context to gles2 helper library.

gpu/demos/framework/pepper.cc

Index: gpu/demos/framework/pepper.cc
===================================================================
--- gpu/demos/framework/pepper.cc	(revision 69442)
+++ gpu/demos/framework/pepper.cc	(working copy)
@@ -2,6 +2,8 @@
 // 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 "base/at_exit.h"
 #include "base/scoped_ptr.h"
 #include "gpu/demos/framework/demo.h"
@@ -12,6 +14,7 @@
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/rect.h"
 #include "ppapi/cpp/size.h"
+#include "ppapi/lib/gl/gles2/gl2ext_ppapi.h"
 
 namespace gpu {
 namespace demos {
@@ -29,9 +32,9 @@
 
   ~PluginInstance() {
     if (!graphics_.is_null()) {
-      graphics_.MakeCurrent();
+      glSetCurrentContextPPAPI(graphics_.pp_resource());

[apatrick_chromium, 2010/12/16 22:46:00]

Unrelated to this patch and an aside but this naming convention makes these
functions look like they are part of a GL extension. The function to set the GL
context is not normally implemented as what Khronos calls a "native platform
graphics interface" like EGL.

[alokp, 2010/12/20 17:24:40]

If we have to keep GLES2 lib independent of EGL lib then I need a hook to set
the current context to be used by the GLES2 lib. Modeling these extra functions
as extensions seemed like a good thing but may be confusing. Fortunately the
clients will never have to use these functions if they are using EGL library.

       demo_.reset();
-      pp::Graphics3D_Dev::ResetCurrent();
+      glSetCurrentContextPPAPI(0);
     }
   }
 
@@ -51,9 +54,9 @@
       if (!pp::Instance::BindGraphics(graphics_))
         return;
 
-      graphics_.MakeCurrent();
+      glSetCurrentContextPPAPI(graphics_.pp_resource());
       demo_->InitGL();
-      pp::Graphics3D_Dev::ResetCurrent();
+      glSetCurrentContextPPAPI(0);
     }
 
     if (demo_->IsAnimated())
@@ -63,10 +66,10 @@
   }
 
   void Paint() {
-    graphics_.MakeCurrent();
+    glSetCurrentContextPPAPI(graphics_.pp_resource());
     demo_->Draw();
     graphics_.SwapBuffers();
-    pp::Graphics3D_Dev::ResetCurrent();
+    glSetCurrentContextPPAPI(0);
   }
 
  private:
@@ -85,8 +88,15 @@
 
 class PluginModule : public pp::Module {
  public:
-  PluginModule() : pp::Module(), at_exit_manager_(new base::AtExitManager) {}
+  PluginModule() : at_exit_manager_(new base::AtExitManager) {}
+  ~PluginModule() {
+    glTerminatePPAPI();
+  }
 
+  virtual bool Init() {
+    return glInitializePPAPI(get_browser_interface()) == GL_TRUE ? true : false;
+  }
+
   virtual pp::Instance* CreateInstance(PP_Instance instance) {
     return new PluginInstance(instance, this);
   }