video: initial port of libretro glide64

mupen64plus-ae · Feb 6, 2016 · 0d93424 · 0d93424
1 parent 7c49534
commit 0d93424
Show file tree

Hide file tree

Showing 58 changed files with 24,071 additions and 70 deletions.
diff --git a/assets/mupen64plus_data/profiles/emulation.cfg b/assets/mupen64plus_data/profiles/emulation.cfg
@@ -10,6 +10,18 @@ r4300Emulator=2
 videoPlugin=libmupen64plus-video-glide64mk2.so
 glide64Frameskip=-5
 
+[libretro-Glide64-Accurate]
+comment=glide64 video with recommended settings for quality
+r4300Emulator=2
+videoPlugin=libmupen64plus-video-glide2gl.so
+glide64Frameskip=0
+
+[libretro-Glide64-Fast]
+comment=glide64 video with recommended settings for speed
+r4300Emulator=2
+videoPlugin=libmupen64plus-video-glide2gl.so
+glide64Frameskip=-5
+
 [GlideN64-GLES-2.0]
 comment=gliden64 video with recommended settings for most older devices
 r4300Emulator=2

diff --git a/jni/mupen64plus-video-glide2gl.mk b/jni/mupen64plus-video-glide2gl.mk
@@ -11,7 +11,10 @@ LOCAL_STATIC_LIBRARIES := png
 LOCAL_ARM_MODE := arm
 
 LOCAL_C_INCLUDES :=                             \
-    $(LOCAL_PATH)/$(SRCDIR)/Glitch64/inc        \
+    $(LOCAL_PATH)/$(SRCDIR)/Glitch64            \
+    $(LOCAL_PATH)/$(SRCDIR)/Glide64             \
+    $(LOCAL_PATH)/$(SRCDIR)/libretro            \
+    $(LOCAL_PATH)/$(SRCDIR)                     \
     $(M64P_API_INCLUDES)                        \
     $(PNG_INCLUDES)                             \
     $(SDL_INCLUDES)                             \
@@ -21,8 +24,8 @@ LOCAL_SRC_FILES :=                              \
     $(SRCDIR)/Glitch64/glitch64_combiner.c      \
     $(SRCDIR)/Glitch64/glitch64_textures.c      \
     $(SRCDIR)/Glitch64/glitchmain.c             \
-    $(SRCDIR)/Glide64/osal_dynamiclib_unix.c    \
     $(SRCDIR)/Glide64/Combine.c                 \
+    $(SRCDIR)/Glide64/DepthBufferRender.c       \
     $(SRCDIR)/Glide64/FBtoScreen.c              \
     $(SRCDIR)/Glide64/glide64_3dmath.c          \
     $(SRCDIR)/Glide64/Glide64_Ini.c             \
@@ -33,6 +36,15 @@ LOCAL_SRC_FILES :=                              \
     $(SRCDIR)/Glide64/MiClWr.c                  \
     $(SRCDIR)/Glide64/TexCache.c                \
     $(SRCDIR)/Glide64/TexLoad.c                 \
+    $(SRCDIR)/libretro/gdp.c                    \
+    $(SRCDIR)/libretro/opengl_state_machine.c   \
+    $(SRCDIR)/libretro/libretro.c               \
+    $(SRCDIR)/libretro/libretro_crc.c           \
+    $(SRCDIR)/libretro/glsym/rglgen.c           \
+    $(SRCDIR)/libretro/glsym/glsym_es2.c        \
+
+
+
 
 LOCAL_CFLAGS :=         \
     $(COMMON_CFLAGS)    \
@@ -56,7 +68,8 @@ LOCAL_LDLIBS :=         \
 
 ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
     # Use for ARM7a:
-    LOCAL_CFLAGS += -mfpu=vfp
+    LOCAL_CFLAGS += -D__ARM_NEON__
+    LOCAL_CFLAGS += -mfpu=neon
     LOCAL_CFLAGS += -mfloat-abi=softfp
 
 else ifeq ($(TARGET_ARCH_ABI), x86)
@@ -67,6 +80,6 @@ else
 
 endif
 
-LOCAL_CFLAGS += -DM64P_CORE_PROTOTYPES -D_ENDUSER_RELEASE -DM64P_PLUGIN_API -D__LIBRETRO__ -DINLINE="inline" -DSDL_VIDEO_OPENGL_ES2=1 -DANDROID -DSINC_LOWER_QUALITY -DHAVE_LOGGER -DHAVE_COMBINE_EXT -fexceptions $(GLFLAGS) -DGLES
+LOCAL_CFLAGS += -DM64P_CORE_PROTOTYPES -D_ENDUSER_RELEASE -DM64P_PLUGIN_API -D__LIBRETRO__ -DINLINE="inline" -DSDL_VIDEO_OPENGL_ES2=1 -DANDROID -DSINC_LOWER_QUALITY -DHAVE_LOGGER -DHAVE_COMBINE_EXT -fexceptions -DGLES -DHAVE_OPENGLES2 -DDISABLE_3POINT -DUSE_GLES
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/jni/mupen64plus-video-glide2gl/src/Glide64/Glide64_Ini.c b/jni/mupen64plus-video-glide2gl/src/Glide64/Glide64_Ini.c
@@ -4,8 +4,8 @@
 #include "rdp.h"
 #include "DepthBufferRender.h"
 
-#include "api/libretro.h"
-#include "../../libretro/SDL.h"
+#include "libretro/libretro.h"
+#include "libretro/SDL.h"
 
 extern bool no_audio;
 extern uint8_t microcode[4096];
@@ -178,7 +178,7 @@ void ReadSpecialSettings (const char * name)
       //depthmode = 0
    }
    // ;Bakushou Jinsei 64 - Mezease! Resort Ou.
-   else if (strstr(name, (const char *)"ÊÞ¸¼®³¼ÞÝ¾²64"))
+   else if (strstr(name, (const char *)"ÃŠÃžÂ¸Â¼Â®Â³Â¼ÃžÃ�Â¾Â²64"))
    {
       //fb_info_disable = 1
       //depthmode = 0
@@ -484,7 +484,7 @@ void ReadSpecialSettings (const char * name)
       hires = 1;
 #endif
    }
-   else if (strstr(name, (const char *)"´¸½ÄØ°ÑG2"))
+   else if (strstr(name, (const char *)"Â´Â¸Â½Ã„Ã˜Â°Ã‘G2"))
    {
       //depthmode = 0
       smart_read = 0;
@@ -526,7 +526,7 @@ void ReadSpecialSettings (const char * name)
       hires = 1;
 #endif
    }
-   else if (strstr(name, (const char *)"´²º³É¾ÝÄ±ÝÄÞØ°½"))
+   else if (strstr(name, (const char *)"Â´Â²ÂºÂ³Ã‰Â¾Ã�Ã„Â±Ã�Ã„ÃžÃ˜ÂÂ°Â½"))
    {
       //;Eikou no Saint Andrew
       settings.correct_viewport = 1;
@@ -604,7 +604,7 @@ void ReadSpecialSettings (const char * name)
       cpu_write_hack = 1;
       //depthmode = 0
    }
-   else if (strstr(name, (const char*)"ÄÞ×´ÓÝ3 ÉËÞÀÉÏÁSOS!"))
+   else if (strstr(name, (const char*)"Ã„ÃžÃ—Â´Ã“Ã�3 Ã‰Ã‹ÃžÃ€Ã‰Ã�Ã�SOS!"))
    {
       //;Doraemon 3 - Nobita no Machi SOS! (J)
       settings.clip_zmin = 1;
@@ -645,7 +645,7 @@ void ReadSpecialSettings (const char * name)
       //depthmode = 0
       settings.buff_clear = 0;
    }
-   else if (strstr(name, (const char*)"F3 Ì³×²É¼ÚÝ2"))
+   else if (strstr(name, (const char*)"F3 ÃŒÂ³Ã—Â²Ã‰Â¼ÃšÃ�2"))
    {
       //;Fushigi no Dungeon - Furai no Shiren 2 (J) 
       settings.decrease_fillrect_edge = 1;
@@ -706,7 +706,7 @@ void ReadSpecialSettings (const char * name)
       settings.swapmode = 0;
    }
    else if (strstr(name, (const char*)"GANBAKE GOEMON") 
-         //|| strstr(name, (const char*)"¶ÞÝÊÞÚ\ ºÞ´ÓÝ") */ TODO: illegal characters - find by ucode CRC */
+         //|| strstr(name, (const char*)"Â¶ÃžÃ�ÃŠÃžÃš\ ÂºÃžÂ´Ã“Ã�") */ TODO: illegal characters - find by ucode CRC */
          || strstr(name, (const char*)"MYSTICAL NINJA")
          || strstr(name, (const char*)"MYSTICAL NINJA2 SG")
          )
@@ -753,14 +753,14 @@ void ReadSpecialSettings (const char * name)
       settings.filtering = 1;
       //depthmode = 1
    }
-   else if (strstr(name, (const char*)"ÊÑ½À°ÓÉ¶ÞÀØ64")
+   else if (strstr(name, (const char*)"ÃŠÃ‘Â½Ã€Â°Ã“Ã‰Â¶ÃžÃ€Ã˜64")
          )
    {
       settings.force_microcheck = 1;
       //depthmode = 0
    }
    else if (strstr(name, (const char*)"HARVESTMOON64")
-         || strstr(name, (const char*)"ÎÞ¸¼Þ®³ÓÉ¶ÞÀØ2")
+         || strstr(name, (const char*)"ÃŽÃžÂ¸Â¼ÃžÂ®Â³Ã“Ã‰Â¶ÃžÃ€Ã˜2")
          )
    {
       settings.zmode_compare_less = 1;
@@ -819,7 +819,7 @@ void ReadSpecialSettings (const char * name)
       //depthmode = 0
       settings.buff_clear = 0;
    }
-   else if (strstr(name, (const char*)"ÓØÀ¼®³·Þ64"))
+   else if (strstr(name, (const char*)"Ã“Ã˜Ã€Â¼Â®Â³Â·Ãž64"))
    {
       //;Morita Shogi 64
       settings.correct_viewport = 1;
@@ -911,7 +911,7 @@ void ReadSpecialSettings (const char * name)
       hires = 1;
 #endif
    }
-   else if (strstr(name, (const char*)"ÄÞ×´ÓÝ Ð¯ÂÉ¾²Ú²¾·"))
+   else if (strstr(name, (const char*)"Ã„ÃžÃ—Â´Ã“Ã� Ã�Â¯Ã‚Ã‰Â¾Â²ÃšÂ²Â¾Â·"))
    {
       //;Doraemon - Mittsu no Seireiseki (J)
       read_back_to_screen = 1;
@@ -921,7 +921,7 @@ void ReadSpecialSettings (const char * name)
       hires = 1;
 #endif
    }
-   else if (strstr(name, (const char*)"HEIWA ÊßÁÝº Ü°ÙÄÞ64"))
+   else if (strstr(name, (const char*)"HEIWA ÃŠÃŸÃ�Ã�Âº ÃœÂ°Ã™Ã„Ãž64"))
    {
       //; Heiwa Pachinko World
       //depthmode = 0
@@ -932,13 +932,13 @@ void ReadSpecialSettings (const char * name)
       hires = 1;
 #endif
    }
-   else if (strstr(name, (const char*)"·×¯Ä¶²¹Â 64ÀÝÃ²ÀÞÝ"))
+   else if (strstr(name, (const char*)"Â·Ã—Â¯Ã„Â¶Â²Â¹Ã‚ 64Ã€Ã�ÃƒÂ²Ã€ÃžÃ�"))
    {
       settings.filtering = 1;
       //depthmode = 0
       settings.buff_clear = 0;
    }
-   else if (strstr(name, (const char*)"½°Êß°ÛÎÞ¯ÄÀ²¾Ý64"))
+   else if (strstr(name, (const char*)"Â½Â°ÃŠÃŸÂ°Ã›ÃŽÃžÂ¯Ã„Ã€Â²Â¾Ã�64"))
    {
       //;Super Robot Taisen 64 (J)
       smart_read = 1;
@@ -957,18 +957,14 @@ void ReadSpecialSettings (const char * name)
       //depthmode = 0
       settings.buff_clear = 0;
    }
-   else if (strstr(name, (const char*)"TOP GEAR RALLY"))
-   {
-      no_audio = true;
-   }
-   else if (strstr(name, (const char*)"½½Ò!À²¾ÝÊß½ÞÙÀÞÏ"))
+   else if (strstr(name, (const char*)"Â½Â½Ã’!Ã€Â²Â¾Ã�ÃŠÃŸÂ½ÃžÃ™Ã€ÃžÃ�"))
    {
       settings.force_microcheck = 1;
       //depthmode = 1
       settings.fog = 0;
       settings.swapmode = 0;
    }
-   else if (strstr(name, (const char*)"ÐÝÅÃÞÀÏºÞ¯ÁÜ°ÙÄÞ"))
+   else if (strstr(name, (const char*)"Ã�Ã�Ã…ÃƒÃžÃ€Ã�ÂºÃžÂ¯Ã�ÃœÂ°Ã™Ã„Ãž"))
    {
       //;Tamagotchi World 64 (J) 
       //depthmode = 0
@@ -1025,7 +1021,7 @@ void ReadSpecialSettings (const char * name)
 #if 0
    // TODO: illegal characters - will have to find this game by ucode CRC
    // later
-   else if (strstr(name, (const char*)"JØ°¸Þ\ ²ÚÌÞÝËÞ°Ä1997"))
+   else if (strstr(name, (const char*)"JÃ˜Â°Â¸Ãž\ Â²ÃšÃŒÃžÃ�Ã‹ÃžÂ°Ã„1997"))
    {
       //;J.League Eleven Beat 1997
       smart_read = 1;
@@ -1062,7 +1058,7 @@ void ReadSpecialSettings (const char * name)
    {
       settings.buff_clear = 0;
    }
-   else if (strstr(name, (const char*)"Ç¼ÂÞØ64"))
+   else if (strstr(name, (const char*)"Ã‡Â¼Ã‚ÃžÃ˜64"))
    {
       //; Nushi Zuri 64
       settings.force_microcheck = 1;

diff --git a/jni/mupen64plus-video-glide2gl/src/Glide64/Glide64_UCode.c b/jni/mupen64plus-video-glide2gl/src/Glide64/Glide64_UCode.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include "Glide64_UCode.h"
 #include "rdp.h"
-#include "api/libretro.h"
+#include "libretro/libretro.h"
 
 extern uint8_t microcode[4096];
 extern uint32_t uc_crc;
@@ -182,8 +182,8 @@ void microcheck(void)
          )
          {
             settings.ucode = 2;
-            if (log_cb)
-               log_cb(RETRO_LOG_INFO, "Microcode 2 - F3DEX 2.XX (The Legend of Zelda: Ocarina of Time)\n");
+            //if (log_cb)
+            //   log_cb(RETRO_LOG_INFO, "Microcode 2 - F3DEX 2.XX (The Legend of Zelda: Ocarina of Time)\n");
          }
    else if (
          uc_crc == UCODE_WAVERACE_64

diff --git a/jni/mupen64plus-video-glide2gl/src/Glide64/glide64_3dmath.c b/jni/mupen64plus-video-glide2gl/src/Glide64/glide64_3dmath.c
@@ -38,7 +38,7 @@
 //****************************************************************
 
 #include "Gfx_1.3.h"
-#include "../../libretro/SDL.h"
+#include "libretro/SDL.h"
 
 #include <math.h>
 #include "3dmath.h"
@@ -208,17 +208,17 @@ void math_init(void)
 {
    unsigned cpu = 0;
 
-   if (perf_get_cpu_features_cb)
-      cpu = perf_get_cpu_features_cb();
+   //if (perf_get_cpu_features_cb)
+   //   cpu = perf_get_cpu_features_cb();
 
 #if defined(__ARM_NEON__)
-   if (cpu & RETRO_SIMD_NEON)
+   if (/*cpu & */RETRO_SIMD_NEON)
    {
       glide64NormalizeVector = NormalizeVectorNeon;
       glide64MulMatrices = MulMatricesNeon;
       glide64DotProduct = DotProductNeon;
-      if (log_cb)
-         log_cb(RETRO_LOG_INFO, "NEON detected, using (some) optimized math functions.\n");
+      //if (log_cb)
+     //    log_cb(RETRO_LOG_INFO, "NEON detected, using (some) optimized math functions.\n");
    }
 #endif
 }

diff --git a/jni/mupen64plus-video-glide2gl/src/Glide64/glide64_rdp.c b/jni/mupen64plus-video-glide2gl/src/Glide64/glide64_rdp.c
@@ -47,7 +47,7 @@
 #include "CRC.h"
 #include "GBI.h"
 #include "Glide64_UCode.h"
-#include "../../libretro/SDL.h"
+#include "libretro/SDL.h"
 
 #ifdef __LIBRETRO__ // Prefix API
 #define VIDEO_TAG(X) glide64##X
@@ -226,8 +226,8 @@ void rdp_new(void)
       rdp.cur_cache[i]   = 0;
    }
 
-   if (perf_get_cpu_features_cb)
-      cpu = perf_get_cpu_features_cb();
+   //if (perf_get_cpu_features_cb)
+   //   cpu = perf_get_cpu_features_cb();
 
    _gSPVertex = gSPVertex_G64;
 }
@@ -236,8 +236,8 @@ void rdp_setfuncs(void)
 {
    if (settings.hacks & hack_Makers)
    {
-      if (log_cb)
-         log_cb(RETRO_LOG_INFO, "Applying Mischief Makers function pointer table tweak...\n");
+      //if (log_cb)
+      //   log_cb(RETRO_LOG_INFO, "Applying Mischief Makers function pointer table tweak...\n");
       gfx_instruction[0][191] = uc0_tri1_mischief;
    }
 }

diff --git a/jni/mupen64plus-video-glide2gl/src/Glide64/glidemain.c b/jni/mupen64plus-video-glide2gl/src/Glide64/glidemain.c
@@ -46,10 +46,10 @@
 #include "FBtoScreen.h"
 #include "DepthBufferRender.h"
 #include "Glide64_Ini.h"
-#include "api/libretro.h"
+#include "libretro/libretro.h"
+#include <android/log.h>
 
 extern void CRC_BuildTable();
-extern retro_log_printf_t log_cb;
 extern uint32_t screen_aspectmodehint;
 
 #if defined(__GNUC__)
@@ -96,6 +96,8 @@ extern uint32_t screen_aspectmodehint;
 
 void (*_gSPVertex)(uint32_t addr, uint32_t n, uint32_t v0);
 
+GFX_INFO gfx_info;
+
 int romopen = false;
 int exception = false;
 
@@ -491,6 +493,8 @@ EXPORT int CALL InitiateGFX (GFX_INFO Gfx_Info)
 
    rdp_new();
 
+   gfx_info = Gfx_Info;
+
    // Assume scale of 1 for debug purposes
    rdp.scale_x = 1.0f;
    rdp.scale_y = 1.0f;
@@ -544,8 +548,8 @@ static void CheckDRAMSize(void)
    else
       BMASK = 0x3FFFFF;
 
-   if (log_cb)
-      log_cb(RETRO_LOG_INFO, "Detected RDRAM size: %08lx\n", BMASK);
+
+   __android_log_print(ANDROID_LOG_ERROR, "glide2gl","Detected RDRAM size: %08lx\n", BMASK);
 }
 
 /******************************************************************

diff --git a/jni/mupen64plus-video-glide2gl/src/Glide64/rdp.h b/jni/mupen64plus-video-glide2gl/src/Glide64/rdp.h
@@ -40,7 +40,7 @@
 #ifndef RDP_H
 #define RDP_H
 
-#include "rdp_common/gdp.h"
+#include "gdp.h"
 #include "Gfx_1.3.h"
 
 extern uint32_t frame_count; // frame counter