Add MGL entry points and port spinning_cube to use them

shell/native_application_support.cc

 // Copyright 2014 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 "shell/native_application_support.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "mojo/public/platform/native/gles2_impl_chromium_miscellaneous_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_chromium_resize_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_chromium_sub_image_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_ext_debug_marker_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_occlusion_query_ext_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_oes_vertex_array_object_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_thunks.h"
 #include "mojo/public/platform/native/gles2_thunks.h"
+#include "mojo/public/platform/native/mgl_onscreen_thunks.h"
+#include "mojo/public/platform/native/mgl_thunks.h"
 #include "mojo/public/platform/native/system_impl_private_thunks.h"
 #include "mojo/public/platform/native/system_thunks.h"
 
 namespace shell {
 
 namespace {
 
 template <typename Thunks>
 bool SetThunks(Thunks (*make_thunks)(),
                const char* function_name,
@@ skipping 36 matching lines @@
     LOG(ERROR) << "MojoSetSystemThunks not found";
     return false;
   }
 
   // TODO(ncbray): enforce the private nature of this API, somehow?
   SetThunks(&MojoMakeSystemImplControlThunksPrivate,
             "MojoSetSystemImplControlThunksPrivate", app_library);
   SetThunks(&MojoMakeSystemImplThunksPrivate, "MojoSetSystemImplThunksPrivate",
             app_library);
 
-  if (SetThunks(&MojoMakeGLES2ControlThunks, "MojoSetGLES2ControlThunks",
-                app_library)) {
-    // If we have the control thunks, we should also have the GLES2
-    // implementation thunks.
-    if (!SetThunks(&MojoMakeGLES2ImplThunks, "MojoSetGLES2ImplThunks",
-                   app_library)) {
-      LOG(ERROR)
-          << "MojoSetGLES2ControlThunks found, but not MojoSetGLES2ImplThunks";
-      return false;
-    }
+  SetThunks(&MojoMakeGLES2ControlThunks, "MojoSetGLES2ControlThunks",
+            app_library);
+  SetThunks(&MojoMakeGLES2ImplThunks, "MojoSetGLES2ImplThunks",
+            app_library);
+  SetThunks(MojoMakeGLES2ImplExtDebugMarkerThunks,
+            "MojoSetGLES2ImplExtDebugMarkerThunks", app_library);
+  SetThunks(MojoMakeGLES2ImplOcclusionQueryExtThunks,
+            "MojoSetGLES2ImplOcclusionQueryExtThunks", app_library);
+  SetThunks(MojoMakeGLES2ImplOesVertexArrayObjectThunks,
+            "MojoSetGLES2ImplOesVertexArrayObjectThunks", app_library);
+  // "Chromium" extensions:
+  SetThunks(MojoMakeGLES2ImplChromiumMiscellaneousThunks,
+            "MojoSetGLES2ImplChromiumMiscellaneousThunks", app_library);
+  SetThunks(MojoMakeGLES2ImplChromiumResizeThunks,
+            "MojoSetGLES2ImplChromiumResizeThunks", app_library);
+  SetThunks(MojoMakeGLES2ImplChromiumSubImageThunks,
+            "MojoSetGLES2ImplChromiumSubImageThunks", app_library);
+  SetThunks(MojoMakeGLES2ImplChromiumSyncPointThunks,
+            "MojoSetGLES2ImplChromiumSyncPointThunks", app_library);
+  SetThunks(MojoMakeGLES2ImplChromiumTextureMailboxThunks,
+            "MojoSetGLES2ImplChromiumTextureMailboxThunks", app_library);
 
-    // If the application is using GLES2 extension points, register those
-    // thunks. Applications may use or not use any of these, so don't warn if
-    // they are missing.
-    SetThunks(MojoMakeGLES2ImplExtDebugMarkerThunks,
-              "MojoSetGLES2ImplExtDebugMarkerThunks", app_library);
-    SetThunks(MojoMakeGLES2ImplOcclusionQueryExtThunks,
-              "MojoSetGLES2ImplOcclusionQueryExtThunks", app_library);
-    SetThunks(MojoMakeGLES2ImplOesVertexArrayObjectThunks,
-              "MojoSetGLES2ImplOesVertexArrayObjectThunks", app_library);
-    // "Chromium" extensions:
-    SetThunks(MojoMakeGLES2ImplChromiumMiscellaneousThunks,
-              "MojoSetGLES2ImplChromiumMiscellaneousThunks", app_library);
-    SetThunks(MojoMakeGLES2ImplChromiumResizeThunks,
-              "MojoSetGLES2ImplChromiumResizeThunks", app_library);
-    SetThunks(MojoMakeGLES2ImplChromiumSubImageThunks,
-              "MojoSetGLES2ImplChromiumSubImageThunks", app_library);
-    SetThunks(MojoMakeGLES2ImplChromiumSyncPointThunks,
-              "MojoSetGLES2ImplChromiumSyncPointThunks", app_library);
-    SetThunks(MojoMakeGLES2ImplChromiumTextureMailboxThunks,
-              "MojoSetGLES2ImplChromiumTextureMailboxThunks", app_library);
+  if (SetThunks(MojoMakeMGLThunks, "MojoSetMGLThunks", app_library)) {
+    // TODO(jamesr): We should only need to expose these on apps that need to
+    // draw to the screen like the system compositor.
+    SetThunks(MojoMakeMGLOnscreenThunks, "MojoSetMGLOnscreenThunks",
+              app_library);
   }
+
   // Unlike system thunks, we don't warn on a lack of GLES2 thunks because
   // not everything is a visual app.
 
   typedef MojoResult (*MojoMainFunction)(MojoHandle);
   MojoMainFunction main_function = reinterpret_cast<MojoMainFunction>(
       base::GetFunctionPointerFromNativeLibrary(app_library, "MojoMain"));
   if (!main_function) {
     LOG(ERROR) << "MojoMain not found";
     return false;
   }
   // |MojoMain()| takes ownership of the Application request handle.
   MojoHandle handle = application_request.PassMessagePipe().release().value();
   MojoResult result = main_function(handle);
   LOG_IF(ERROR, result != MOJO_RESULT_OK)
       << "MojoMain returned error (result: " << result << ")";
   return true;
 }
 
 }  // namespace shell