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 68 matching lines @@
               "MojoSetGLES2ImplChromiumMiscellaneousThunks", app_library);
     SetThunks(MojoMakeGLES2ImplChromiumResizeThunks,
               "MojoSetGLES2ImplChromiumResizeThunks", app_library);
     SetThunks(MojoMakeGLES2ImplChromiumSubImageThunks,
               "MojoSetGLES2ImplChromiumSubImageThunks", app_library);
     SetThunks(MojoMakeGLES2ImplChromiumSyncPointThunks,
               "MojoSetGLES2ImplChromiumSyncPointThunks", app_library);
     SetThunks(MojoMakeGLES2ImplChromiumTextureMailboxThunks,
               "MojoSetGLES2ImplChromiumTextureMailboxThunks", app_library);
   }
+  SetThunks(MojoMakeMGLThunks, "MojoSetMGLThunks", app_library);

[viettrungluu, 2015/08/12 02:48:10]

I suppose the conditional for the GLES2 control thunks would eventually be
replaced by this eventually?

(It's a little awkward[*] to add this to the conditional above, since you'd
really want a non-short-circuiting logical or, which is a bit weird.)

[*] Also a little wrong, since conceivably you might want MGL without the GLES2
impl (e.g., if you want GLES3).

Maybe add a TODO or something like that?

[jamesr, 2015/08/13 19:42:27]

I made the MGL onscreen thunks conditional on the MGL thunks but made the rest
unconditional (so an app can get the GLES2 impl thunks without the GLES2 control
thunks, which it needs to make GL calls on a context it creates with MGL.  I'm
not sure having any of these be conditional makes a lot of sense

+
+  // 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);

[viettrungluu, 2015/08/12 02:48:10]

And presumably this would also be conditional on there being the basic MGL
thunks....

+
   // 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