Changeset 1440Tweet

Timestamp:

Jun 5, 2012, 8:15:56 PM (11 years ago)

Author:

sam

Message:

nacl: NaCl binaries no longer need a modified main() to work, the NaCl
instance object takes care of everything for us.

Location:

trunk/src

Files:

• Makefile.am (modified) (1 diff)
• application/application.cpp (modified) (1 diff)
• platform/nacl/nacl-app.cpp (moved) (moved from trunk/src/platform/nacl/naclapp.cpp) (3 diffs)
• platform/nacl/nacl-app.h (moved) (moved from trunk/src/platform/nacl/naclapp.h)
• platform/nacl/nacl-instance.cpp (moved) (moved from trunk/src/platform/nacl/nacl_instance.cpp) (8 diffs)
• platform/nacl/nacl-instance.h (added)
• platform/nacl/nacl-module.cpp (moved) (moved from trunk/src/platform/nacl/nacl_module.cpp) (1 diff)
• platform/nacl/nacl_instance.h (deleted)
• platform/nacl/opengl_context.h (modified) (1 diff)

trunk/src/Makefile.am

@@ -72 +72 @@
 if USE_NACL
 nacl_sources = \
-    platform/nacl/naclapp.cpp platform/nacl/naclapp.h \
-    platform/nacl/nacl_instance.cpp platform/nacl/nacl_instance.h \
-    platform/nacl/nacl_module.cpp \
+    platform/nacl/nacl-app.cpp platform/nacl/nacl-app.h \
+    platform/nacl/nacl-instance.cpp platform/nacl/nacl-instance.h \
+    platform/nacl/nacl-module.cpp \
     platform/nacl/opengl_context.cpp platform/nacl/opengl_context.h \
     platform/nacl/opengl_context_ptrs.h

trunk/src/application/application.cpp

@@ -21 +21 @@
 #   include "platform/xbox/xboxapp.h"
 #elif defined __native_client__
-#   include "platform/nacl/naclapp.h"
+#   include "platform/nacl/nacl-app.h"
 #elif defined __ANDROID__
 #   include "platform/android/androidapp.h"

trunk/src/platform/nacl/nacl-app.cpp

@@ -13 +13 @@
 #endif
 
-#if defined __native_client__
-#   include <ppapi/cpp/instance.h>
-#   include <ppapi/cpp/module.h>
-#   include <ppapi/cpp/var.h>
-#endif
+#include "core.h"
 
-#include "core.h"
-#include "lolgl.h"
-#include "naclapp.h"
+#include "nacl-app.h"
+#include "nacl-instance.h"
 
 namespace lol
@@ -46 +41 @@
     data(new NaClAppData())
 {
+    Ticker::Setup(fps);
 #if defined __native_client__
 #endif
@@ -57 +53 @@
 void NaClApp::Run()
 {
-    while (!Ticker::Finished())
-    {
-        /* Tick the renderer, show the frame and clamp to desired framerate. */
-        Ticker::TickDraw();
+#if defined __native_client__
+    NaClInstance::MainSignal();
+#endif
 
-#if defined __native_client__
-#endif
-    }
+    /* Wait forever */
+    Queue<int, 1> q;
+    q.Pop();
 }
 

trunk/src/platform/nacl/nacl-instance.cpp

@@ -11 +11 @@
 #include <cstring>
 #include <string>
-#include <vector>
 
 #include <ppapi/cpp/rect.h>
@@ -21 +20 @@
 
 #include "core.h"
-#include "debug/quad.h"
 
-#include "platform/nacl/nacl_instance.h"
+#include "platform/nacl/nacl-instance.h"
 #include "platform/nacl/opengl_context.h"
 
@@ -47 +45 @@
 {
     // Destroy the cube view while GL context is current.
-    opengl_context_->MakeContextCurrent(this);
+    m_opengl_ctx->MakeContextCurrent(this);
 }
 
@@ -85 +83 @@
 }
 
+Mutex NaClInstance::main_mutex;
+Queue<NaClInstance::Args *, 1> NaClInstance::main_queue;
+
 bool NaClInstance::Init(uint32_t argc,
                         const char* /* argn */[],
                         const char* argv[])
 {
-    Ticker::Setup(60.0f);
-
-    /* Call the user's main() function. FIXME: run it in a thread */
+    /* Ensure only one NaClInstance does Init() at the same time. */
+    main_mutex.Lock();
     char *env[] = { NULL };
-    lol_nacl_main();
-    lol_nacl_main(argc, const_cast<char **>(argv));
-    lol_nacl_main(argc, const_cast<char **>(argv), (char **)env);
+    Args arglist(argc, const_cast<char **>(argv), const_cast<char **>(env));
+    main_queue.Push(&arglist);
+    m_main_thread = new Thread(MainRun, NULL);
+    /* Push so that only MainSignal() can unblock us */
+    main_queue.Push(NULL);
+    main_queue.Push(NULL);
+    main_mutex.Unlock();
 
     // My timer callback
@@ -108 +112 @@
 }
 
-void NaClInstance::RunMain(uint32_t argc,
-                           const char* /* argn */[],
-                           const char* argv[])
+void * NaClInstance::MainRun(void *data)
 {
+    Args *arglist = main_queue.Pop();
 
+    /* Call the user's main() function. One of these will work. */
+    lol_nacl_main();
+    lol_nacl_main(arglist->m_argc, arglist->m_argv);
+    lol_nacl_main(arglist->m_argc, arglist->m_argv, arglist->m_env);
+
+    return NULL;
+}
+
+void NaClInstance::MainSignal()
+{
+    /* FIXME: find something more elegant. */
+    main_queue.Pop();
+    main_queue.Pop();
 }
 
@@ -130 +146 @@
     m_size = ivec2(position.size().width(), position.size().height());
 
-    if (opengl_context_ == NULL)
-        opengl_context_.reset(new OpenGLContext(this));
-    opengl_context_->InvalidateContext(this);
-    opengl_context_->ResizeContext(position.size());
-    if (!opengl_context_->MakeContextCurrent(this))
+    if (m_opengl_ctx == NULL)
+        m_opengl_ctx.reset(new OpenGLContext(this));
+    m_opengl_ctx->InvalidateContext(this);
+    m_opengl_ctx->ResizeContext(position.size());
+    if (!m_opengl_ctx->MakeContextCurrent(this))
         return;
 
@@ -152 +168 @@
         break;
     case PP_INPUTEVENT_TYPE_MOUSEMOVE:
-        Input::SetMousePos(ivec2(pp::MouseInputEvent(event).GetPosition().x(), opengl_context_->GetSize().height() - 1 - pp::MouseInputEvent(event).GetPosition().y()));
+        Input::SetMousePos(ivec2(pp::MouseInputEvent(event).GetPosition().x(), m_opengl_ctx->GetSize().height() - 1 - pp::MouseInputEvent(event).GetPosition().y()));
         break;
     default:
@@ -162 +178 @@
 void NaClInstance::DrawSelf()
 {
-    if (opengl_context_ == NULL)
+    if (m_opengl_ctx == NULL)
         return;
 
-    opengl_context_->MakeContextCurrent(this);
+    m_opengl_ctx->MakeContextCurrent(this);
     Ticker::TickDraw();
-    opengl_context_->FlushContext();
+    m_opengl_ctx->FlushContext();
 }
 

trunk/src/platform/nacl/nacl-module.cpp

@@ -12 +12 @@
 
 #include "core.h"
-#include "lolgl.h"
+#include "lolgl.h" /* needed for GL_TRUE */
 
-#include "platform/nacl/nacl_instance.h"
+#include "platform/nacl/nacl-instance.h"
 
 /// The Module class.  The browser calls the CreateInstance() method to create

trunk/src/platform/nacl/opengl_context.h

@@ -70 +70 @@
 
   /// The PP_Resource needed to make GLES2 calls through the Pepper interface.
-  const PP_Resource gl_context() const {
+  PP_Resource gl_context() const {
     return context_.pp_resource();
   }