Merge pull request #69 from m4xw/mupen_updates

Mupen updates

GLideN64/src/GLideNHQ/Ext_TxFilter.h

@@ -34,7 +34,9 @@
 #define CHDIR(a) SetCurrentDirectoryW(a)
 #else
 #include <iostream>
+#ifndef __LIBRETRO__
 #include <dlfcn.h>
+#endif
 #include <unistd.h>
 #define MAX_PATH 4095
 #define TXHMODULE void*

GLideN64/src/GLideNHQ/TxFilter.cpp

@@ -299,23 +299,28 @@ TxFilter::filter(uint8 *src, int srcwidth, int srcheight, uint16 srcformat, uint
 					numcore--;
 				}
 				if (blkrow > 0 && numcore > 1) {
+#ifndef HAVE_LIBNX
 					std::thread *thrd[MAX_NUMCORE];
+#endif
 					unsigned int i;
 					int blkheight = blkrow << 2;
 					unsigned int srcStride = (srcwidth * blkheight) << 2;
 					unsigned int destStride = srcStride * scale * scale;
 					for (i = 0; i < numcore - 1; i++) {
+#ifndef HAVE_LIBNX
 						thrd[i] = new std::thread(std::bind(filter_8888,
 																(uint32*)_texture,
 																srcwidth,
 																blkheight,
 																(uint32*)_tmptex,
 																filter,
 																i));
+#endif
 						_texture += srcStride;
 						_tmptex  += destStride;
 					}
-					thrd[i] = new std::thread(std::bind(filter_8888,
+#ifndef HAVE_LIBNX
+                    thrd[i] = new std::thread(std::bind(filter_8888,
 															(uint32*)_texture,
 															srcwidth,
 															srcheight - blkheight * i,
@@ -326,6 +331,7 @@ TxFilter::filter(uint8 *src, int srcwidth, int srcheight, uint16 srcformat, uint
 						thrd[i]->join();
 						delete thrd[i];
 					}
+#endif
 				} else {
 					filter_8888((uint32*)_texture, srcwidth, srcheight, (uint32*)_tmptex, filter, 0);
 				}

GLideN64/src/GLideNHQ/TxQuantize.cpp

@@ -843,21 +843,26 @@ TxQuantize::quantize(uint8* src, uint8* dest, int width, int height, uint16 srcf
 			numcore--;
 		}
 		if (blkrow > 0 && numcore > 1) {
+#ifndef HAVE_LIBNX
 			std::thread *thrd[MAX_NUMCORE];
+#endif
 			unsigned int i;
 			int blkheight = blkrow << 2;
 			unsigned int srcStride = (width * blkheight) << (2 - bpp_shift);
 			unsigned int destStride = srcStride << bpp_shift;
 			for (i = 0; i < numcore - 1; i++) {
+#ifndef HAVE_LIBNX
 				thrd[i] = new std::thread(std::bind(quantizer,
 														this,
 														(uint32*)src,
 														(uint32*)dest,
 														width,
 														blkheight));
+#endif
 				src  += srcStride;
 				dest += destStride;
 			}
+#ifndef HAVE_LIBNX
 			thrd[i] = new std::thread(std::bind(quantizer,
 													this,
 													(uint32*)src,
@@ -868,6 +873,7 @@ TxQuantize::quantize(uint8* src, uint8* dest, int width, int height, uint16 srcf
 				thrd[i]->join();
 				delete thrd[i];
 			}
+#endif
 		} else {
 			(*this.*quantizer)((uint32*)src, (uint32*)dest, width, height);
 		}
@@ -897,22 +903,27 @@ TxQuantize::quantize(uint8* src, uint8* dest, int width, int height, uint16 srcf
 			numcore--;
 		}
 		if (blkrow > 0 && numcore > 1) {
+#ifndef HAVE_LIBNX
 			std::thread *thrd[MAX_NUMCORE];
+#endif
 			unsigned int i;
 			int blkheight = blkrow << 2;
 			unsigned int srcStride = (width * blkheight) << 2;
 			unsigned int destStride = srcStride >> bpp_shift;
 			for (i = 0; i < numcore - 1; i++) {
+#ifndef HAVE_LIBNX
 				thrd[i] = new std::thread(std::bind(quantizer,
 														this,
 														(uint32*)src,
 														(uint32*)dest,
 														width,
 														blkheight));
+#endif
 				src  += srcStride;
 				dest += destStride;
 			}
-			thrd[i] = new std::thread(std::bind(quantizer,
+#ifndef HAVE_LIBNX
+            thrd[i] = new std::thread(std::bind(quantizer,
 													this,
 													(uint32*)src,
 													(uint32*)dest,
@@ -922,6 +933,7 @@ TxQuantize::quantize(uint8* src, uint8* dest, int width, int height, uint16 srcf
 				thrd[i]->join();
 				delete thrd[i];
 			}
+#endif
 		} else {
 			(*this.*quantizer)((uint32*)src, (uint32*)dest, width, height);
 		}

GLideN64/src/GLideNHQ/TxUtil.cpp

@@ -491,6 +491,10 @@ int
 TxUtil::getNumberofProcessors()
 {
 	int numcore = 1;
+    #ifdef SWITCH
+    return 1;
+    #endif
+
 #ifndef ANDROID
 	try {
 #if defined (OS_WINDOWS)

GLideN64/src/Textures.cpp

@@ -18,6 +18,10 @@
 #include "GLideNHQ/Ext_TxFilter.h"
 #include "TextureFilterHandler.h"
 
+#ifdef HAVE_LIBNX
+#include <switch.h>
+#endif
+
 using namespace std;
 
 const GLuint g_noiseTexIndex = 2;
@@ -1408,11 +1412,19 @@ void TextureCache::update(u32 _t)
 			if (m_toggleDumpTex) {
 				displayLoadProgress(L"Texture dump - ON\n");
 				_clear();
+                #ifdef SWITCH
+                svcSleepThread(1000000000);
+                #else
 				std::this_thread::sleep_for(std::chrono::seconds(1));
+                #endif
 			}
 			else {
 				displayLoadProgress(L"Texture dump - OFF\n");
+                #ifdef SWITCH
+                svcSleepThread(1000000000);
+                #else
 				std::this_thread::sleep_for(std::chrono::seconds(1));
+                #endif
 			}
 		}
 	}

GLideN64/src/Types.h

@@ -1,26 +1,36 @@
 #ifndef TYPES_H
 #define TYPES_H
 
+#ifdef HAVE_LIBNX
+#include <switch.h>
+#endif
+
 typedef unsigned char			u8;	/* unsigned  8-bit */
 typedef unsigned short			u16;	/* unsigned 16-bit */
 typedef unsigned int			u32;	/* unsigned 32-bit */
+#ifndef HAVE_LIBNX
 typedef unsigned long long		u64;	/* unsigned 64-bit */
-
+#endif
 typedef signed char			s8;	/* signed  8-bit */
 typedef short				s16;	/* signed 16-bit */
 typedef int				s32;	/* signed 32-bit */
+#ifndef HAVE_LIBNX
 typedef long long			s64;	/* signed 64-bit */
+#endif
 
 typedef volatile unsigned char		vu8;	/* unsigned  8-bit */
 typedef volatile unsigned short		vu16;	/* unsigned 16-bit */
 typedef volatile unsigned int		vu32;	/* unsigned 32-bit */
+#ifndef HAVE_LIBNX
 typedef volatile unsigned long long	vu64;	/* unsigned 64-bit */
+#endif
 
 typedef volatile signed char	vs8;	/* signed  8-bit */
 typedef volatile short			vs16;	/* signed 16-bit */
 typedef volatile int			vs32;	/* signed 32-bit */
+#ifndef HAVE_LIBNX
 typedef volatile long long		vs64;	/* signed 64-bit */
-
+#endif
 typedef float				f32;	/* single prec floating point */
 typedef double				f64;	/* double prec floating point */
 

GLideN64/src/winlnxdefs.h

@@ -30,7 +30,10 @@
 #ifndef WINLNXDEFS_H
 #define WINLNXDEFS_H
 
+#ifndef __LIBRETRO__
 #include <dlfcn.h>
+#endif
+
 #include <errno.h>
 #include <limits.h> // PATH_MAX
 #include <stdlib.h> // malloc(), srand()
@@ -95,7 +98,9 @@ typedef const char 	*LPCSTR;
 static inline const char *GetPluginDir()
 {
 	static char path[PATH_MAX];
-
+#ifdef SWITCH
+    return "/";
+#else
 #ifdef __USE_GNU
 	Dl_info info;
 	void *addr = (void *)GetPluginDir;
@@ -122,6 +127,7 @@ static inline const char *GetPluginDir()
 #endif
 
 	return path;
+#endif // SWITCH
 }
 
 #endif

Makefile

@@ -118,9 +118,25 @@ else ifneq (,$(findstring rpi,$(platform)))
       CPUFLAGS += -march=armv8-a+crc -mtune=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard
       HAVE_NEON = 1
    endif
-
    COREFLAGS += -DOS_LINUX
    ASFLAGS = -f elf -d ELF_TYPE
+
+# Nintendo Switch
+else ifeq ($(platform), libnx)
+   include $(DEVKITPRO)/libnx/switch_rules
+   PIC = 1
+   TARGET := $(TARGET_NAME)_libretro_$(platform).a
+   CPUOPTS := -g -march=armv8-a -mtune=cortex-a57 -mtp=soft -mcpu=cortex-a57+crc+fp+simd
+   PLATCFLAGS = -O3 -ffast-math -funsafe-math-optimizations -fPIE -I$(PORTLIBS)/include/ -I$(LIBNX)/include/ -ffunction-sections -fdata-sections -ftls-model=local-exec -specs=$(LIBNX)/switch.specs
+   PLATCFLAGS += $(INCLUDE) -D__SWITCH__=1 -DSWITCH -DHAVE_LIBNX -D_GLIBCXX_USE_C99_MATH_TR1 -D_LDBL_EQ_DBL -funroll-loops
+   SOURCES_C += $(CORE_DIR)/src/r4300/empty_dynarec.c
+   CXXFLAGS += -fno-rtti -std=gnu++11
+   COREFLAGS += -DOS_LINUX
+   GLES = 0
+   WITH_DYNAREC =
+   DYNAREC_USED = 0
+   STATIC_LINKING = 1
+
 # ODROIDs
 else ifneq (,$(findstring odroid,$(platform)))
    TARGET := $(TARGET_NAME)_libretro.so
@@ -304,17 +320,22 @@ ifeq ($(HAVE_NEON), 1)
    COREFLAGS += -DHAVE_NEON -D__ARM_NEON__ -D__NEON_OPT -ftree-vectorize -mvectorize-with-neon-quad -ftree-vectorizer-verbose=2 -funsafe-math-optimizations -fno-finite-math-only
 endif
 
-COREFLAGS += -D__LIBRETRO__ -DUSE_FILE32API -DM64P_PLUGIN_API -DM64P_CORE_PROTOTYPES -D_ENDUSER_RELEASE -DSINC_LOWER_QUALITY -DMUPENPLUSAPI -DTXFILTER_LIB -D__VEC4_OPT
+COREFLAGS += -D__LIBRETRO__ -DUSE_FILE32API -DM64P_PLUGIN_API -DM64P_CORE_PROTOTYPES -D_ENDUSER_RELEASE -DSINC_LOWER_QUALITY -DTXFILTER_LIB -D__VEC4_OPT -DMUPENPLUSAPI
 
 ifeq ($(DEBUG), 1)
    CPUOPTS += -O0 -g
    CPUOPTS += -DOPENGL_DEBUG
 else
-   CPUOPTS += -O2 -DNDEBUG -fsigned-char -ffast-math -fno-strict-aliasing -fomit-frame-pointer -fvisibility=hidden
+   CPUOPTS += -DNDEBUG -fsigned-char -ffast-math -fno-strict-aliasing -fomit-frame-pointer -fvisibility=hidden
+ifneq ($(platform), libnx)
+   CPUOPTS := -O2 $(CPUOPTS)
+endif
    CXXFLAGS += -fvisibility-inlines-hidden
 endif
 
+ifneq ($(platform), libnx)
 CXXFLAGS += -std=c++11
+endif
 
 ifeq ($(PIC), 1)
    fpic = -fPIC

Makefile.common

@@ -41,7 +41,8 @@ SOURCES_C += \
 	$(RSPDIR)/src/memory.c \
 	$(RSPDIR)/src/mp3.c \
 	$(RSPDIR)/src/musyx.c \
-	$(ROOT_DIR)/custom/mupen64plus-rsp-hle/plugin.c
+	$(RSPDIR)/src/re2.c \
+	$(RSPDIR)/src/plugin.c
 
 ifeq ($(LLE), 1)
 SOURCES_C += \

custom/GLideN64/MupenPlusPluginAPI.cpp

@@ -10,32 +10,6 @@ EXPORT int CALL RomOpen(void)
 	return 1;
 }
 
-EXPORT m64p_error CALL PluginGetVersion(
-	m64p_plugin_type * _PluginType,
-	int * _PluginVersion,
-	int * _APIVersion,
-	const char ** _PluginNamePtr,
-	int * _Capabilities
-)
-{
-	return M64ERR_SUCCESS;
-}
-
-EXPORT m64p_error CALL PluginStartup(
-	m64p_dynlib_handle CoreLibHandle,
-	void *Context,
-	void (*DebugCallback)(void *, int, const char *)
-)
-{
-	return M64ERR_SUCCESS;
-}
-
-EXPORT m64p_error CALL PluginShutdown(void)
-{
-	video().stop();
-	return M64ERR_SUCCESS;
-}
-
 EXPORT void CALL ReadScreen2(void *dest, int *width, int *height, int front)
 {
 }

custom/mupen64plus-core/main/main.c

@@ -306,7 +306,7 @@ m64p_error main_run(void)
     open_sra_file(&sra);
 
     /* setup backends */
-    aout = (struct audio_out_backend){ &g_dev.ai, set_audio_format_via_audio_plugin, push_audio_samples_via_audio_plugin };
+    aout = (struct audio_out_backend){ &g_dev.ai, set_audio_format_via_libretro, push_audio_samples_via_libretro };
     rtc = (struct clock_backend){ NULL, get_time_using_C_localtime };
     fla_storage = (struct storage_backend){ &fla, save_storage_file_libretro };
     sra_storage = (struct storage_backend){ &sra, save_storage_file_libretro };