Resync (#218)

* Resync

* Resync: Move the user_data pointer

Author: RobLoach

audio/audio_mixer.c

@@ -76,6 +76,7 @@
 struct audio_mixer_sound
 {
    enum audio_mixer_type type;
+   void* user_data;
 
    union
    {

gfx/gl_capabilities.c

@@ -287,15 +287,12 @@ bool gl_check_capability(enum gl_capability_enum enum_idx)
          }
          break;
       case GL_CAPS_FP_FBO:
-         /* GLES - No extensions for float FBO currently. */
-#ifndef HAVE_OPENGLES
          if (gl_check_capability(GL_CAPS_FBO))
          {
             /* Float FBO is core in 3.2. */
-            if (gl_query_core_context_in_use() || gl_query_extension("ARB_texture_float"))
+            if (gl_query_core_context_in_use() || gl_query_extension("ARB_texture_float") || gl_query_extension("OES_texture_float_linear"))
                return true;
          }
-#endif
          break;
       case GL_CAPS_BGRA8888:
 #ifdef HAVE_OPENGLES

include/retro_timers.h

@@ -39,7 +39,7 @@
 #include <psp2/kernel/threadmgr.h>
 #elif defined(_3DS)
 #include <3ds.h>
-#elif defined(EMSCRIPTEN_FIXME)
+#elif defined(EMSCRIPTEN)
 #include <emscripten/emscripten.h>
 #else
 #include <time.h>
@@ -100,7 +100,7 @@ static int nanosleepDOS(const struct timespec *rqtp, struct timespec *rmtp)
 #define retro_sleep(msec) (usleep(1000 * (msec)))
 #elif defined(WIIU)
 #define retro_sleep(msec) (OSSleepTicks(ms_to_ticks((msec))))
-#elif defined(EMSCRIPTEN_FIXME)
+#elif defined(EMSCRIPTEN)
 #define retro_sleep(msec) (emscripten_sleep(msec))
 #else
 static INLINE void retro_sleep(unsigned msec)