Changeset 1084Tweet

Timestamp:

Nov 21, 2011, 1:49:53 AM (12 years ago)

Author:

sam

Message:

nacl: the Mandelbrot zoomer is starting to work on NaCl.

Location:

trunk

Files:

• build-nacl32 (added)
• build-nacl64 (moved) (moved from trunk/build-nacl)
• build/lol-build (modified) (2 diffs)
• configure.ac (modified) (2 diffs)
• src/Makefile.am (modified) (1 diff)
• src/platform/nacl/nacl_instance.cpp (added)
• src/platform/nacl/nacl_instance.h (added)
• src/platform/nacl/nacl_module.cpp (added)
• src/platform/nacl/naclapp.cpp (modified) (1 diff)
• src/platform/nacl/opengl_context.cpp (added)
• src/platform/nacl/opengl_context.h (added)
• src/platform/nacl/opengl_context_ptrs.h (added)
• test/tutorial/tut01.cpp (modified) (1 diff)
• test/tutorial/tut03.cpp (modified) (14 diffs)

trunk/build/lol-build

@@ -16 +16 @@
 #  - linux-i386
 #  - linux-amd64
+#  - nacl-i386
 #  - nacl-amd64
 #  - ios-arm
@@ -120 +121 @@
             android update project --path .
             ;;
+        nacl-i386)
+            ./configure CXX=i686-nacl-g++ CC=i686-nacl-gcc ac_cv_exeext=.32.nexe --host=none LOL_LIBS="-lppapi -lppapi_gles2 -lppapi_cpp -u _ZN2pp12CreateModuleEv"
+            ;;
         nacl-amd64)
-            # no need for "-u _ZN2pp12CreateModuleEv" but it could be helpful
-            ./configure CXX=x86_64-nacl-g++ CC=x86_64-nacl-gcc ac_cv_exeext=.nexe --host=none LOL_LIBS="-lppapi -lppapi_gles2 -lppapi_cpp"
+            ./configure CXX=x86_64-nacl-g++ CC=x86_64-nacl-gcc ac_cv_exeext=.64.nexe --host=none LOL_LIBS="-lppapi -lppapi_gles2 -lppapi_cpp -u _ZN2pp12CreateModuleEv"
             ;;
         ps3-ppu)

trunk/configure.ac

@@ -191 +191 @@
 AC_CHECK_FUNCS(glBegin)
 LIBS="${save_LIBS}"
+
 
 dnl Use SDL? (always required on Linux or Win32)
@@ -253 +254 @@
 
 
+dnl  Use NativeClient?
+ac_cv_my_have_nacl="no"
+AC_LANG_PUSH(C++)
+AC_CHECK_HEADERS(ppapi/cpp/instance.h, [ac_cv_my_have_nacl="yes"])
+AC_LANG_POP(C++)
+AM_CONDITIONAL(USE_NACL, test "${ac_cv_my_have_nacl}" != "no")
+
 dnl Use EGL?
 ac_cv_my_have_egl="no"

trunk/src/Makefile.am

@@ -44 +44 @@
     platform/sdl/sdlinput.cpp platform/sdl/sdlinput.h
 
+if USE_NACL
 nacl_sources = \
-    platform/nacl/naclapp.cpp platform/nacl/naclapp.h
+    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/opengl_context.cpp platform/nacl/opengl_context.h \
+    platform/nacl/opengl_context_ptrs.h
+endif
 
 if HAVE_PS3

trunk/src/platform/nacl/naclapp.cpp

@@ -14 +14 @@
 
 #if defined __native_client__
-#   include "ppapi/cpp/instance.h"
-#   include "ppapi/cpp/module.h"
-#   include "ppapi/cpp/var.h"
+#   include <ppapi/cpp/instance.h>
+#   include <ppapi/cpp/module.h>
+#   include <ppapi/cpp/var.h>
 #endif
 

trunk/test/tutorial/tut01.cpp

@@ -22 +22 @@
 #if USE_SDL && defined __APPLE__
 #   include <SDL_main.h>
+#endif
+
+#if defined __native_client__
+#   define main old_main
 #endif
 

trunk/test/tutorial/tut03.cpp

@@ -60 +60 @@
         /* Window size decides the world aspect ratio. For instance, 640×480
          * will be mapped to (-0.66,-0.5) - (0.66,0.5). */
+#if !defined __native_client__
         m_window_size = Video::GetSize();
+#else
+        /* FIXME: it's illegal to call this on the game thread! */
+        m_window_size = ivec2(640, 480);
+#endif
         if (m_window_size.y < m_window_size.x)
             m_window2world = 0.5 / m_window_size.y;
@@ -77 +82 @@
         }
         m_center = -0.75;
+#if defined __CELLOS_LV2__ || defined __native_client__
+        m_zoom_speed = -0.0025;
+#else
         m_zoom_speed = 0.0;
+#endif
         m_radius = 5.0;
         m_ready = false;
@@ -101 +110 @@
             uint8_t green = g * 255.99f;
             uint8_t blue = b * 255.99f;
-            m_palette[i] = u8vec4(blue, green, red, 0);
-        }
-
+#if defined __native_client__
+            m_palette[i] = u8vec4(red, green, blue, 255);
+#else
+            m_palette[i] = u8vec4(blue, green, red, 255);
+#endif
+        }
+
+#if !defined __native_client__
         m_centertext = new Text(NULL, "gfx/font/ascii.png");
         m_centertext->SetPos(ivec3(5, m_window_size.y - 15, 1));
@@ -115 +129 @@
         m_zoomtext->SetPos(ivec3(5, m_window_size.y - 43, 1));
         Ticker::Ref(m_zoomtext);
+#endif
 
         position = ivec3(0, 0, 0);
@@ -125 +140 @@
     {
         Input::UntrackMouse(this);
+#if !defined __native_client__
         Ticker::Unref(m_centertext);
         Ticker::Unref(m_mousetext);
         Ticker::Unref(m_zoomtext);
+#endif
         delete m_pixels;
         delete m_tmppixels;
@@ -159 +176 @@
 
         ivec3 buttons = Input::GetMouseButtons();
-#ifdef __CELLOS_LV2__
-        m_zoom_speed = 0.0005;
-#else
+#if !defined __CELLOS_LV2__ && !defined __native_client__
         if ((buttons[0] || buttons[2]) && mousepos.x != -1)
         {
@@ -183 +198 @@
             double zoom = pow(2.0, deltams * m_zoom_speed);
             if (m_radius * zoom > 8.0)
+            {
+                m_zoom_speed *= -1.0;
                 zoom = 8.0 / m_radius;
+            }
             else if (m_radius * zoom < 1e-14)
+            {
+                m_zoom_speed *= -1.0;
                 zoom = 1e-14 / m_radius;
+            }
             m_radius *= zoom;
-#ifdef __CELLOS_LV2__
-            m_center = f64cmplx(-.22815528839841, -1.11514249704382);
+#if defined __CELLOS_LV2__ || defined __native_client__
+            //m_center = f64cmplx(-.22815528839841, -1.11514249704382);
             //m_center = f64cmplx(0.001643721971153, 0.822467633298876);
+            m_center = f64cmplx(-0.65823419062254, .50221777363480);
 #else
             m_center = (m_center - worldmouse) * zoom + worldmouse;
@@ -231 +253 @@
         }
 
+#if !defined __native_client__
         char buf[128];
         sprintf(buf, "center: %+16.14f%+16.14fi", m_center.x, m_center.y);
@@ -238 +261 @@
         sprintf(buf, "  zoom: %g", 1.0 / m_radius);
         m_zoomtext->SetText(buf);
+#endif
 
         u8vec4 *m_pixelstart = m_pixels + m_size.x * m_size.y / 4 * m_frame;
@@ -285 +309 @@
                 else
                 {
-                    *m_pixelstart++ = u8vec4(0, 0, 0, 0);
+                    *m_pixelstart++ = u8vec4(0, 0, 0, 255);
                 }
             }
@@ -335 +359 @@
             m_shader = Shader::Create(
 #if !defined __CELLOS_LV2__
+#if !defined HAVE_GLES_2X
                 "#version 120\n"
-                "attribute vec2 in_TexCoord;\n"
+#else
+                "precision highp float;"
+#endif
+                ""
+#if defined HAVE_GLES_2X
+                "varying vec2 pass_TexCoord;"
+#endif
+                "attribute vec2 in_TexCoord;"
                 "attribute vec2 in_Vertex;"
                 "void main(void) {"
                 "    gl_Position = vec4(in_Vertex, 0.0, 1.0);"
-                "    gl_TexCoord[0] = vec4(in_TexCoord, 0.0, 0.0);\n"
+#if defined HAVE_GLES_2X
+                "    pass_TexCoord = in_TexCoord;"
+#else
+                "    gl_TexCoord[0] = vec4(in_TexCoord, 0.0, 0.0);"
+#endif
                 "}",
 
+#if !defined HAVE_GLES_2X
                 "#version 120\n"
-                ""
+#else
+                "precision highp float;"
+#endif
+                ""
+#if defined HAVE_GLES_2X
+                "varying vec2 pass_TexCoord;"
+#endif
                 "uniform vec4 in_TexelSize;"
                 "uniform mat4 in_ZoomSettings;"
@@ -412 +455 @@
                 ""
                 "void main(void) {"
+#if defined HAVE_GLES_2X
+                "    vec2 coord = pass_TexCoord;"
+#else
                 "    vec2 coord = gl_TexCoord[0].xy;"
+#endif
                 /* Slightly shift our pixel so that it does not lie at
                  * an exact texel boundary. This would lead to visual
@@ -514 +561 @@
         }
 
+#if !defined HAVE_GLES_2X
         glEnable(GL_TEXTURE_2D);
+#endif
         glBindTexture(GL_TEXTURE_2D, m_texid);
 
@@ -599 +648 @@
 
     /* Debug information */
+#if !defined __native_client__
     Text *m_centertext, *m_mousetext, *m_zoomtext;
+#endif
 };