Alpha Testing Underway!

[Paul]

Here's the version with the egl init code from gles2n64.

Do you have any name preferences for your plug-in? (I was just going to go with something generic like "GLES2Rice", but I want to be sure and use whatever name you came up with, so you get credit for your hard work).

[Paul]

May be on devices without NEON you use VFP? With soft float it runs slow on 748MHz ARMv6, and older devices without VFP anyway can't play comfortly

Here is a build with VFP c-flags:

ARM6, VFP Test

This will break the emulator on ARM5 devices (there doesn't seem to be a provision for specifying an ARM6-only build in the Android makefiles - it lumps ARM6 and ARM5 together under the heading "armeabi").

Everyone with an ARM6 device, please run this test and let me know if it has any effect on performance (better, worse, or no noticeable change)

[goodboy735]

It's about the same for me... Don't see any graphical gliches..

PS: Would there be a way to get an onscreen fps display? or even average fps every few seconds in the logcat..

[Ganster41]

Work fine on my Orange San Francisco(MSM7227 ARM1136EJ-S). Don't know faster or not, but works. Mario64 works without visible lags and without VFP, I try other ROM later...
Sound still laggy(

[MaXiMu]

I test armv6 vfp possible small speed up but unstable crash if push x button

Code: [Select]

I/ActivityManager( 2020): Start proc paulscode.android.mupen64plus for activity paulscode.android.mupen64plus/.SDLActivity: pid=5157 uid=10044 gids={3003, 1015}

D/dalvikvm( 5157): Trying to load lib /data/data/paulscode.android.mupen64plus/lib/libSDL.so 0x45c79528

D/dalvikvm( 5157): Added shared lib /data/data/paulscode.android.mupen64plus/lib/libSDL.so 0x45c79528

D/dalvikvm( 5157): Trying to load lib /data/data/paulscode.android.mupen64plus/lib/libcore.so 0x45c79528

D/dalvikvm( 5157): Added shared lib /data/data/paulscode.android.mupen64plus/lib/libcore.so 0x45c79528

D/dalvikvm( 5157): No JNI_OnLoad found in /data/data/paulscode.android.mupen64plus/lib/libcore.so 0x45c79528, skipping init

D/dalvikvm( 5157): Trying to load lib /data/data/paulscode.android.mupen64plus/lib/librsp-hle.so 0x45c79528

D/dalvikvm( 5157): Added shared lib /data/data/paulscode.android.mupen64plus/lib/librsp-hle.so 0x45c79528

D/dalvikvm( 5157): No JNI_OnLoad found in /data/data/paulscode.android.mupen64plus/lib/librsp-hle.so 0x45c79528, skipping init

D/dalvikvm( 5157): Trying to load lib /data/data/paulscode.android.mupen64plus/lib/libinput-sdl.so 0x45c79528

D/dalvikvm( 5157): Added shared lib /data/data/paulscode.android.mupen64plus/lib/libinput-sdl.so 0x45c79528

D/dalvikvm( 5157): No JNI_OnLoad found in /data/data/paulscode.android.mupen64plus/lib/libinput-sdl.so 0x45c79528, skipping init

D/dalvikvm( 5157): Trying to load lib /data/data/paulscode.android.mupen64plus/lib/libaudio-sdl.so 0x45c79528

D/dalvikvm( 5157): Added shared lib /data/data/paulscode.android.mupen64plus/lib/libaudio-sdl.so 0x45c79528

D/dalvikvm( 5157): No JNI_OnLoad found in /data/data/paulscode.android.mupen64plus/lib/libaudio-sdl.so 0x45c79528, skipping init

D/dalvikvm( 5157): Trying to load lib /data/data/paulscode.android.mupen64plus/lib/libgles2n64.so 0x45c79528

D/dalvikvm( 5157): Added shared lib /data/data/paulscode.android.mupen64plus/lib/libgles2n64.so 0x45c79528

D/dalvikvm( 5157): No JNI_OnLoad found in /data/data/paulscode.android.mupen64plus/lib/libgles2n64.so 0x45c79528, skipping init

D/dalvikvm( 5157): Trying to load lib /data/data/paulscode.android.mupen64plus/lib/libmain.so 0x45c79528

D/dalvikvm( 5157): Added shared lib /data/data/paulscode.android.mupen64plus/lib/libmain.so 0x45c79528

V/SDLActivity.java( 5157): CPU info available from file /proc/cpuinfo:

V/SDLActivity.java( 5157): Processor : ARMv6-compatible processor rev 5 (v6l)

V/SDLActivity.java( 5157): BogoMIPS : 791.34

V/SDLActivity.java( 5157): Features : swp half thumb fastmult vfp edsp java

V/SDLActivity.java( 5157): CPU implementer : 0x41

V/SDLActivity.java( 5157): CPU architecture: 6TEJ

V/SDLActivity.java( 5157): CPU variant : 0x1

V/SDLActivity.java( 5157): CPU part : 0xb36

V/SDLActivity.java( 5157): CPU revision : 5

V/SDLActivity.java( 5157):

V/SDLActivity.java( 5157): Hardware : IMAPX200

V/SDLActivity.java( 5157): Revision : 0000

V/SDLActivity.java( 5157): Serial : 0000000000000000

V/SDLActivity.java( 5157): ����������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������

I/System.out( 5157): libSDL: Creating startup screen

I/System.out( 5157): libSDL: Starting data downloader

I/System.out( 5157): libSDL: Starting downloader

I/global  ( 5157): Default buffer size used in BufferedReader constructor. It would be better to be explicit if an 8k-char buffer is required.

I/global  ( 5157): Default buffer size used in BufferedReader constructor. It would be better to be explicit if an 8k-char buffer is required.

V/GamePad ( 5157): Mupen64Plus AE Analog Touch

V/GamePad ( 5157):     ver 1.0

V/GamePad ( 5157):     Analog gamepad with a clean, intuitive layout

V/GamePad ( 5157):     Author: roymustang16 and Paul Lamb

D/dalvikvm( 5157): GC_EXTERNAL_ALLOC freed 1543 objects / 144664 bytes in 58ms

D/dalvikvm( 5157): GC_EXTERNAL_ALLOC freed 424 objects / 355088 bytes in 46ms

V/SDL     ( 5157): pixel format OPAQUE (using SDL_PIXELFORMAT_RGB565)

I/SDL     ( 5157): SDL_Android_Init()

V/front_end( 5157):  __  __                         __   _  _   ____  _             

V/front_end( 5157): |  \/  |_   _ _ __   ___ _ __  / /_ | || | |  _ \| |_   _ ___

V/front_end( 5157): | |\/| | | | | '_ \ / _ \ '_ \| '_ \| || |_| |_) | | | | / __| 

V/front_end( 5157): | |  | | |_| | |_) |  __/ | | | (_) |__   _|  __/| | |_| \__ \ 

V/front_end( 5157): |_|  |_|\__,_| .__/ \___|_| |_|\___/   |_| |_|   |_|\__,_|___/ 

V/front_end( 5157):              |_|         http://code.google.com/p/mupen64plus/ 

V/front_end( 5157): Mupen64Plus Console User-Interface Version 1.99.4

V/front_end( 5157):

V/core_interface( 5157): UI-console: attached to core library 'Mupen64Plus Core' version 1.99.4

V/core_interface( 5157):             Includes support for Dynamic Recompiler.

I/ActivityManager( 2020): Displayed activity paulscode.android.mupen64plus/.SDLActivity: 795 ms (total 795 ms)

V/front_end( 5157): Core: Goodname: Super Mario 64 (U) [!]

V/front_end( 5157): Core: Name: SUPER MARIO 64

V/front_end( 5157): Core: MD5: 20B854B239203BAF6C961B850A4A51A2

V/front_end( 5157): Core: CRC: ff2b5a63 2623028b

V/front_end( 5157): Core: Imagetype: .v64 (byteswapped)

V/front_end( 5157): Core: Rom size: 8388608 bytes (or 8 Mb or 64 Megabits)

V/front_end( 5157): Core: Version: 44140000

V/front_end( 5157): Core: Manufacturer: 4e000000

V/front_end( 5157): Core: Country: USA

V/cheat   ( 5157): UI-Console: Cheat codes disabled.

V/front-end( 5157): UI-console: using Video plugin: 'gles2n64' v0.0.5

V/front-end( 5157): UI-console: using Audio plugin: 'Mupen64Plus SDL Audio Plugin' v1.99.4

V/front_end( 5157): Input: No auto-configuration found for device 'Android accelerometer'

V/front_end( 5157): Input: N64 Controller #1: Forcing default keyboard configuration

V/front_end( 5157): Input: Using auto-configuration for device 'Keyboard'

V/front-end( 5157): UI-console: using Input plugin: 'Mupen64Plus SDL Input Plugin' v1.99.4

V/front-end( 5157): UI-console: using RSP plugin: 'Hacktarux/Azimer High-Level Emulation RSP Plugin' v1.99.4

D/gles2n64( 5157): [gles2n64]: Loading Config from data/gles2n64.conf

D/gles2n64( 5157): Rom is NTSC

D/gles2n64( 5157): [gles2N64]: Searching data/gles2n64rom.conf Database for "SUPER MARIO 64" ROM

D/gles2n64( 5157): Initializing SDL video subsystem...

D/gles2n64( 5157): Setting video mode 800x480...

I/SDL     ( 5157): [STUB] GL_LoadLibrary

V/SDL     ( 5157): Starting up OpenGL ES 2.0

D/libEGL  ( 5157): loaded /system/lib/egl/libEGL_VIVANTE.so

D/libEGL  ( 5157): loaded /system/lib/egl/libGLESv1_CM_VIVANTE.so

D/libEGL  ( 5157): loaded /system/lib/egl/libGLESv2_VIVANTE.so

I/SDL     ( 5157): [STUB] GL_SetSwapInterval

I/SDL     ( 5157): [STUB] GL_GetSwapInterval

E/gralloc ( 5157): handle 0x2a7d00 not locked

V/gles2N64 (OpenGL)( 5157): Using settings for hardware profile IMAP (-0.001f, -0.001f)

E/gralloc ( 5157): handle 0x2a8c20 not locked

V/front_end( 5157): Input: N64 Controller #1: Using keyboard/mouse

V/front_end( 5157): Input: 1 controller(s) found, 1 plugged in and usable in the emulator

V/front_end( 5157): Input: Mupen64Plus SDL Input Plugin version 1.99.4 initialized.

I/ActivityManager( 2020): Process com.noshufou.android.su (pid 5112) has died.

V/front_end( 5157): Audio: Initializing SDL audio subsystem...

V/SDL     ( 5157): SDL audio: opening device

V/SDL     ( 5157): SDL audio: wanted stereo 16-bit 44.1kHz, 2048 frames buffer

V/SDL     ( 5157): SDL audio: got stereo 16-bit 44.1kHz, 4096 frames buffer

D/ALSAModule( 1956): open called for devices 00000002 in mode 0...

D/        ( 1956): [external/alsa-lib/src/pcm/pcm_hw.c]:snd_pcm_hw_prepare

I/ALSAModule( 1956): Initialized ALSA PLAYBACK device default

I/ActivityManager( 2020): Process com.android.quicksearchbox (pid 5086) has died.

I/ActivityManager( 2020): Process siir.es.adbWireless (pid 5104) has died.

I/WindowManager( 2020): WIN DEATH: Window{45e7fe60 siir.es.adbWireless/siir.es.adbWireless.adbWireless paused=false}

I/ActivityManager( 2020): Process com.android.settings (pid 5144) has died.

V/front_end( 5157): Core: Starting R4300 emulator: Dynamic Recompiler

I/ActivityManager( 2020): Process android.process.acore (pid 3201) has died.

I/WindowManager( 2020): WIN DEATH: Window{45e53a88 mobi.SyndicateApps.ICSPlus/mobi.SyndicateApps.ICSv2.Launcher paused=false}

I/ActivityManager( 2020): Low Memory: No more background processes.

V/SDL     ( 5157): SDL audio: opening device

V/SDL     ( 5157): SDL audio: wanted stereo 16-bit 44.1kHz, 2048 frames buffer

V/SDL     ( 5157): SDL audio: got stereo 16-bit 44.1kHz, 4096 frames buffer

D/ALSAModule( 1956): open called for devices 00000002 in mode 0...

D/        ( 1956): [external/alsa-lib/src/pcm/pcm_hw.c]:snd_pcm_hw_prepare

I/ALSAModule( 1956): Initialized ALSA PLAYBACK device default

V/front_end( 5157): Audio Warning: AiLenChanged(): Audio buffer overflow.

V/front_end( 5157): Audio Warning: AiLenChanged(): Audio buffer overflow.

V/front_end( 5157): Audio Warning: AiLenChanged(): Audio buffer overflow.

V/front_end( 5157): Audio Warning: AiLenChanged(): Audio buffer overflow.

V/front_end( 5157): Audio Warning: AiLenChanged(): Audio buffer overflow.

V/front_end( 5157): Audio Warning: AiLenChanged(): Audio buffer overflow.

V/front_end( 5157): Audio Warning: AiLenChanged(): Audio buffer overflow.

V/front_end( 5157): Audio Warning: AiLenChanged(): Audio buffer overflow.

V/front_end( 5157): Audio Warning: AiLenChanged(): Audio buffer overflow.

D/skia    ( 2020): purging 121K from font cache [14 entries]

D/dalvikvm( 2020): GC_EXPLICIT freed 17404 objects / 805280 bytes in 118ms

V/front_end( 5157): Audio Warning: AiLenChanged(): Audio buffer overflow.

V/front_end( 5157): Audio Warning: AiLenChanged(): Audio buffer overflow.

V/front_end( 5157): Audio Warning: AiLenChanged(): Audio buffer overflow.

V/front_end( 5157): Audio Warning: AiLenChanged(): Audio buffer overflow.

W/AudioTrack( 5157): obtainBuffer timed out (is the CPU pegged?) 0x2ae470 user=00001000, server=00000000

D/ALSAModule( 1956): open called for devices 00000002 in mode 0...

D/        ( 1956): [external/alsa-lib/src/pcm/pcm_hw.c]:snd_pcm_hw_prepare

I/ALSAModule( 1956): Initialized ALSA PLAYBACK device default

D/gles2n64( 5157): UCODE CRC=0x6932365f

E/gralloc ( 5157): handle 0x2a7d00 not locked

D/dalvikvm( 2111): GC_EXPLICIT freed 14 objects / 416 bytes in 128ms

V/tlb     ( 5157): Enabled TLB

W/AudioTrack( 5157): obtainBuffer timed out (is the CPU pegged?) 0x2ae470 user=0004e000, server=0004d000

D/ALSAModule( 1956): open called for devices 00000002 in mode 0...

D/        ( 1956): [external/alsa-lib/src/pcm/pcm_hw.c]:snd_pcm_hw_prepare

I/ALSAModule( 1956): Initialized ALSA PLAYBACK device default

D/dalvikvm( 2107): GC_EXPLICIT freed 717 objects / 30528 bytes in 104ms

D/dalvikvm( 2702): GC_EXPLICIT freed 6 objects / 208 bytes in 91ms

W/AudioTrack( 5157): obtainBuffer timed out (is the CPU pegged?) 0x2ae470 user=00078000, server=00077000

D/ALSAModule( 1956): open called for devices 00000002 in mode 0...

D/        ( 1956): [external/alsa-lib/src/pcm/pcm_hw.c]:snd_pcm_hw_prepare

I/ALSAModule( 1956): Initialized ALSA PLAYBACK device default

W/KeyCharacterMap( 5157): No keyboard for id 0

W/KeyCharacterMap( 5157): Using default keymap: /system/usr/keychars/qwerty.kcm.bin

I/        ( 5157): [KEYOPS JNI] JNIforKeyops loading.

V/SDL_androidkeyboard( 5157): Converted Android KeyCode 52 into SDL ScanCode 27

V/front_end( 5157): Core: R4300 emulator finished.

V/core    ( 5157):     R4300 CPU core finished, shutting down

V/SDL_androidkeyboard( 5157): Converted Android KeyCode 52 into SDL ScanCode 27

V/SDL_androidkeyboard( 5157): Converted Android KeyCode 52 into SDL ScanCode 27

V/core    ( 5157):     Calling SDL_Quit()

I/SDL     ( 5157): [STUB] GL_UnloadLibrary

D/gles2n64( 5157): Stopping OpenGL

V/front_end( 5157): Core Status: Rom closed.

I/WindowManager( 2020): WIN DEATH: Window{45e57048 SurfaceView paused=false}

I/ActivityManager( 2020): Process paulscode.android.mupen64plus (pid 5157) has died.

I/WindowManager( 2020): WIN DEATH: Window{45ee5418 paulscode.android.mupen64plus/paulscode.android.mupen64plus.SDLActivity paused=false}

[Paul]

I test armv6 vfp possible small speed up but unstable crash if push x button

From the logcat, it looks like a normal shutdown without any errors as soon as you press the button with scancode 27.  Is scancode 27 the X button?  If so, that is normal, because in [sdcard]/app-data/paulscode.android.mupen64plus/mupen64plus.cfg the scancode for "Stop" is 27 by default (you can change this to something else, if you need the X button).

[Paul]

Would there be a way to get an onscreen fps display? or even average fps every few seconds in the logcat..

I'm planning to add an optional fps object type to the virtual gamepad skins, which would allow you to define where on the screen the FPS counter would be positioned (top-left by default) when an option is checked in the GUI.  I'll have to fix the redraw bug first, though.  It's on my to-do list 

[MaXiMu]

ah I view now it you added the function to exit the emulator Good function 

[Ganster41]

Oh, why Google doesn't implement OpenSL ES library in Android lesser then 2.3 With it possible to use hardware accelerated audio playback...

[Paul]

I've added FPS logging to the logcat output for those of you who have been asking for it.  I'm not sure if I'm doing the calculation correctly, though.  I have it checking the system time every 30 calls to flip the EGL buffers.  In theory, the EGL buffers should be getting flipped once per frame.  I'm getting between 27-30 FPS on Mario64, but the target FPS in gles2n64rom.conf is at 25 FPS (that's why I'm not sure if I'm doing the calculation correctly).  It should still be close enough to be useful, though.

FPS Test

[Ganster41]

In Mario64 I get 12-16 FPS, in Zelda: Ocarina of Time - 7-9

[Paul]

Porting GLES2Rice is taking a bit more time than I expected.  Hit a bit of a snag because STL is handled a little weird in Android (so the compiler get's stuck on GeneralCombiner.h when it tries to include <vector>).  This is fairly well documented, though, so I should have the solution figured out if I do a little more googling.

[koekje]

If this rice port works will we be able to use texture packs?

[Paul]

If this rice port works will we be able to use texture packs?

That's definitely the goal, but it will take some more work to get it to a usable level of performance.  I've got it more-or-less running on Android, but it has two new bugs that I'll have to work out (most likely related to the initialization code I added).  Here is the .apk and source-code:

Test APK  (source code)

To switch to GLES2Rice, edit mupen64plus.cfg and scroll to the bottom.  Change the filename from libgles2n64.so to libgles2rice.so.  The first new bug in the code I added is that a lot of polygons are either missing or textured black (in game I can see most of the Mario model, but everything else is not visible).  The second new bug is that the frame is too large for the screen.  The framerate averages the same for both video plug-ins on my phone, which is a good sign (could mean it will perform better than gles2n64 once some ARM7a/Neon optimizations have been developed).

It might be good to try it out on some different devices (Qualcomm in particular, since that is what Kris has tested it on) to see if there are any differences and maybe give me some ideas.  I'm not going to focus too much more on debugging this plug-in until I finish the GUI, though (I get side-tracked too easily.. I need to make myself stay on track, haha!)

[Kris]

The code for hires textures is currently commented out as it means there are fewer libraries needed to compile but it should be easy enough to fix or use SDL_Image instead.

I hardcoded 1024x768 in one or two places. If you check EndUpdate in OGLTexture it is probably the texture format that needs to be changed. You can test it with GL_RGBA, the colours will be wrong but you can see if that is the issue. The spec says they should be the same but BGRA is convenient and works for a few devices. You could swap the R,B bytes yourself before gltexture2D I'd copy the data and swap that instead of swaping the original just in case.