Add quakespasm, and OpenGL+SDL-based port of quake1.

ports/sdl/nacl.patch

 diff --git a/Makefile.in b/Makefile.in
 index e29dc6d..bb485dd 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -36,13 +36,13 @@ TARGET  = libSDL.la
  SOURCES = @SOURCES@
  OBJECTS = @OBJECTS@
  
 -SDLMAIN_TARGET = libSDLmain.a
 +SDLMAIN_TARGET = libSDLmain.la
@@ skipping 315 matching lines @@
  extern AudioBootStrap MINTAUDIO_DMA8_bootstrap;
  #endif
 +#if SDL_AUDIO_DRIVER_NACL
 +extern AudioBootStrap NACLAUD_bootstrap;
 +#endif
  #if SDL_AUDIO_DRIVER_DISK
  extern AudioBootStrap DISKAUD_bootstrap;
  #endif
 diff --git a/src/audio/nacl/SDL_naclaudio.cc b/src/audio/nacl/SDL_naclaudio.cc
 new file mode 100644
-index 0000000..908a498
+index 0000000..7a02156
 --- /dev/null
 +++ b/src/audio/nacl/SDL_naclaudio.cc
-@@ -0,0 +1,150 @@
+@@ -0,0 +1,140 @@
 +#include "SDL_config.h"
 +#include "SDL_naclaudio.h"
 +
 +#include <assert.h>
 +
 +#include <ppapi/c/pp_instance.h>
 +#include <ppapi/c/ppb.h>
 +#include <ppapi/c/ppb_audio.h>
 +#include <ppapi/c/ppb_audio_config.h>
 +#include <ppapi/c/ppb_core.h>
@@ skipping 54 matching lines @@
 +    SDL_OutOfMemory();
 +    if (_this) {
 +      SDL_free(_this);
 +    }
 +    return (0);
 +  }
 +  SDL_memset(_this->hidden, 0, (sizeof *_this->hidden));
 +
 +  _this->hidden->mutex = SDL_CreateMutex();
 +
-+  _this->hidden->opened = false;
-+
 +  // TODO: Move audio device creation to NACLAUD_OpenAudio.
-+  const PPB_Audio_1_1* g_nacl_audio_interface =
++  g_nacl_audio_interface =
 +      (const PPB_Audio_1_1*)g_nacl_get_interface(PPB_AUDIO_INTERFACE_1_1);
-+  const PPB_AudioConfig_1_1* g_nacl_audio_config_interface =
++  g_nacl_audio_config_interface =
 +      (const PPB_AudioConfig_1_1*)g_nacl_get_interface(
 +          PPB_AUDIO_CONFIG_INTERFACE_1_1);
 +
 +  _this->hidden->sample_frame_count =
 +      g_nacl_audio_config_interface->RecommendSampleFrameCount(
 +          g_nacl_pp_instance, PP_AUDIOSAMPLERATE_44100, kSampleFrameCount);
 +
 +  PP_Resource audio_config = g_nacl_audio_config_interface->CreateStereo16Bit(
 +      g_nacl_pp_instance, PP_AUDIOSAMPLERATE_44100,
 +      _this->hidden->sample_frame_count);
@@ skipping 11 matching lines @@
 +
 +  return _this;
 +}
 +
 +AudioBootStrap NACLAUD_bootstrap = {
 +    NACLAUD_DRIVER_NAME, "SDL nacl audio driver",
 +    NACLAUD_Available, NACLAUD_CreateDevice
 +};
 +
 +static void NACLAUD_CloseAudio(_THIS) {
-+  SDL_LockMutex(_this->hidden->mutex);
-+  _this->hidden->opened = 0;
-+  SDL_UnlockMutex(_this->hidden->mutex);
 +}
 +
 +static void AudioCallback(void* samples, uint32_t buffer_size, PP_TimeDelta,
 +                          void* data) {
 +  SDL_AudioDevice* _this = reinterpret_cast<SDL_AudioDevice*>(data);
 +
 +  SDL_LockMutex(_this->hidden->mutex);
-+  if (_this->hidden->opened) {
++  /* Only do anything if audio is enabled and not paused */
++  if (_this->enabled && !_this->paused) {
 +    SDL_memset(samples, _this->spec.silence, buffer_size);
 +    SDL_LockMutex(_this->mixer_lock);
 +    (*_this->spec.callback)(_this->spec.userdata, (Uint8*)samples, buffer_size);
 +    SDL_UnlockMutex(_this->mixer_lock);
 +  } else {
 +    SDL_memset(samples, 0, buffer_size);
 +  }
 +  SDL_UnlockMutex(_this->hidden->mutex);
 +
 +  return;
 +}
 +
 +static int NACLAUD_OpenAudio(_THIS, SDL_AudioSpec* spec) {
 +  // We don't care what the user wants.
 +  spec->freq = 44100;
 +  spec->format = AUDIO_S16LSB;
 +  spec->channels = 2;
 +  spec->samples = _this->hidden->sample_frame_count;
-+
-+  SDL_LockMutex(_this->hidden->mutex);
-+  _this->hidden->opened = 1;
-+  SDL_UnlockMutex(_this->hidden->mutex);
-+
-+  // Do not create an audio thread.
 +  return 1;
 +}
 +
 +}  // extern "C"
 diff --git a/src/audio/nacl/SDL_naclaudio.h b/src/audio/nacl/SDL_naclaudio.h
 new file mode 100644
-index 0000000..b166ab0
+index 0000000..ab52848
 --- /dev/null
 +++ b/src/audio/nacl/SDL_naclaudio.h
-@@ -0,0 +1,30 @@
+@@ -0,0 +1,23 @@
 +#include "SDL_config.h"
 +
 +#ifndef _SDL_naclaudio_h
 +#define _SDL_naclaudio_h
 +
 +extern "C" {
 +#include "SDL_audio.h"
 +#include "../SDL_sysaudio.h"
 +#include "SDL_mutex.h"
 +}
 +
 +#include <ppapi/c/ppb_audio.h>
 +
 +/* Hidden "this" pointer for the video functions */
 +#define _THIS  SDL_AudioDevice *_this
 +
 +struct SDL_PrivateAudioData {
-+
 +  SDL_mutex* mutex;
-+  // This flag is use to determine when the audio is opened and we can start
-+  // serving audio data instead of silence. This is needed because current
-+  // Pepper2 can only be used from the main thread; Therefore, we start the
-+  // audio thread very early.
-+  bool opened;
-+
 +  int sample_frame_count;
 +  PP_Resource audio;
 +};
 +
 +#endif /* _SDL_naclaudio_h */
 diff --git a/src/cpuinfo/SDL_cpuinfo.c b/src/cpuinfo/SDL_cpuinfo.c
 index 5c2d81f..7a757a3 100644
 --- a/src/cpuinfo/SDL_cpuinfo.c
 +++ b/src/cpuinfo/SDL_cpuinfo.c
 @@ -53,6 +53,8 @@ static void illegal_instruction(int sig)
@@ skipping 16 matching lines @@
 +static __inline__ int CPU_getCPUIDFeatures(void) { return 0; }
 +
 +#endif // SDL_ASSEMBLY_ROUTINES
 +
 +
  static __inline__ int CPU_haveRDTSC(void)
  {
         if ( CPU_haveCPUID() ) {
 diff --git a/src/main/nacl/pepper_instance.c b/src/main/nacl/pepper_instance.c
 new file mode 100644
-index 0000000..997e13a
+index 0000000..6e1f036
 --- /dev/null
 +++ b/src/main/nacl/pepper_instance.c
-@@ -0,0 +1,310 @@
+@@ -0,0 +1,338 @@
 +/*
 + * Copyright (c) 2011 The Native Client 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 <assert.h>
 +#include <errno.h>
 +#include <fcntl.h>
 +#include <libtar.h>
 +#include <pthread.h>
@@ skipping 120 matching lines @@
 +  free(message);
 +  return count;
 +}
 +
 +static void ProcessArgs() {
 +  int i;
 +  int rtn;
 +  int mount_default = 1;
 +  nacl_io_log("SDL: ProcessArgs %d\n", g_argc);
 +
-+  umount("/");
++  // This could fail if the sdl_mount_http attributes

[binji, 2014/07/18 23:48:04]

Hm, this seems like a significant change. Mention it in the CL description?

[Sam Clegg, 2014/07/19 00:59:50]

Split into separate CL

++  // above created a mount on "/".
++  fprintf(stderr, "SDL: creating memfs on root\n");
++
++  rtn = umount("/");
++  if (rtn != 0)
++    fprintf(stderr, "SDL: umount failed: %s\n", strerror(errno));
++
++  rtn = mount("", "/", "memfs", 0, "");
++  if (rtn != 0)
++    fprintf(stderr, "SDL: mount failed: %s\n", strerror(errno));
++
++  rtn = mkdir("/tmp", S_IRWXU | S_IRWXG);
++  if (rtn != 0)
++    fprintf(stderr, "SDL: mkdir /tmp failed: %s\n", strerror(errno));
++
++  rtn = mkdir("/home", S_IRWXU | S_IRWXG);
++  if (rtn != 0)
++    fprintf(stderr, "SDL: mkdir /home failed: %s\n", strerror(errno));
++
++  rtn = mount("", "/tmp", "html5fs", 0, "type=TEMPORARY");
++  if (rtn != 0)
++    fprintf(stderr, "SDL: mount /tmp failed: %s\n", strerror(errno));
 +
 +  for (i = 0; i < g_argc; i++) {
 +    if (!strcmp(g_argn[i], "ps_stdout")) {
 +      int fd1 = open(g_argv[i], O_WRONLY);
 +      dup2(fd1, 1);
 +    } else if (!strcmp(g_argn[i], "ps_stderr")) {
 +      int fd2 = open(g_argv[i], O_WRONLY);
 +      dup2(fd2, 2);
 +    } else if (!strcmp(g_argn[i], "ps_tty_prefix")) {
 +      g_tty_prefix = g_argv[i];
@@ skipping 37 matching lines @@
 +        rtn = mount(source, target, "httpfs", 0, "");
 +        if (rtn != 0)
 +          fprintf(stderr, "SDL: mount failed: %s\n", strerror(errno));
 +      }
 +    }
 +  }
 +
 +  if (mount_default) {
 +    // Create an http mount by default
 +    fprintf(stderr, "SDL: creating default http mount\n");
-+    rtn = mount("", "/", "httpfs", 0, "");
-+    if (rtn != 0) fprintf(stderr, "SDL: mount failed: %s\n", strerror(errno));
-+  } else {
-+    // This could fail if the sdl_mount_http attributes
-+    // about created a mount on "/".
-+    fprintf(stderr, "SDL: creating memfs on root\n");
-+    mount("", "/", "memfs", 0, "");
++    rtn = chdir("/home");
++    if (rtn != 0)
++      fprintf(stderr, "SDL: chdir failed: %s\n", strerror(errno));
++    rtn = mount(".", "/home", "httpfs", 0, "");
++    if (rtn != 0)
++      fprintf(stderr, "SDL: mount failed: %s\n", strerror(errno));
 +  }
 +
 +  for (i = 0; i < g_argc; i++) {
-+    if (!strcmp(g_argn[i], "sdl_tar_extract")) {
++    nacl_io_log("SDL: arg=%s\n", g_argn[i]);
++    if (!stricmp(g_argn[i], "PWD")) {
++      int rtn = chdir(g_argv[i]);
++      if (rtn != 0)
++        nacl_io_log("SDL: chdir(%s) failed\n", g_argv[i]);
++      else
++        nacl_io_log("SDL: chdir(%s)\n", g_argv[i]);
++    } else if (!strcmp(g_argn[i], "sdl_tar_extract")) {
 +      const char* source;
 +      const char* target = "/";
 +      char* sep;
 +      char buf[64];
 +      int n;
 +
 +      const char* q, *p = g_argv[i];
 +      while (*p) {
 +        while (*p && isspace(*p)) ++p;
 +        if (!*p) break;
@@ skipping 17 matching lines @@
 +
 +        TAR* tar;
 +        rtn = tar_open(&tar, (char*)source, NULL, O_RDONLY, 0, 0);
 +        if (rtn != 0) {
 +          fprintf(stderr, "SDL: tar_open failed\n");
 +          assert(0);
 +          continue;
 +        }
 +
 +        rtn = mkdir(target, S_IRWXU | S_IRWXG);
-+        if (rtn != 0) {
++        if (rtn != 0)
 +          fprintf(stderr, "SDL: mkdir failed: %s\n", strerror(errno));
-+        }
++
 +        rtn = tar_extract_all(tar, (char*)target);
 +        if (rtn != 0) {
 +          fprintf(stderr, "SDL: tar_extract_all failed\n");
 +          assert(0);
 +        }
 +
 +        rtn = tar_close(tar);
 +        if (rtn != 0) {
 +          fprintf(stderr, "SDL: tar_clone failed\n");
 +          assert(0);
@@ skipping 996 matching lines @@
 +    queue_.push(event);
 +    SDL_UnlockMutex(mu_);
 +   } 
 +
 +private:
 +  std::queue<SDL_Event*> queue_;
 +  SDL_mutex* mu_;
 +};
 +
 +#endif // _SDL_nacl_eventqueue_h