diff --git a/Android/jni/Project64-video/Project64-video.mk b/Android/jni/Project64-video/Project64-video.mk index 61358b79e..52bb1d5e3 100644 --- a/Android/jni/Project64-video/Project64-video.mk +++ b/Android/jni/Project64-video/Project64-video.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_PATH := $(JNI_LOCAL_PATH) SRCDIR := ./ -LOCAL_MODULE := Project64-gfx-Project64 +LOCAL_MODULE := Project64-gfx LOCAL_STATIC_LIBRARIES := common \ zlib \ Settings \ diff --git a/Android/src/emu/project64/AndroidDevice.java b/Android/src/emu/project64/AndroidDevice.java index 8d49253ce..a3395982f 100644 --- a/Android/src/emu/project64/AndroidDevice.java +++ b/Android/src/emu/project64/AndroidDevice.java @@ -64,8 +64,8 @@ public class AndroidDevice public static final boolean IS_ACTION_BAR_AVAILABLE = AndroidDevice.IS_HONEYCOMB && !AndroidDevice.IS_OUYA_HARDWARE; final static boolean isTv; - public final static int nativeWidth, nativeWidthOriginal; - public final static int nativeHeight, nativeHeightOriginal; + public final static int nativeWidth; + public final static int nativeHeight; public static boolean MapVolumeKeys = false; @@ -91,11 +91,6 @@ public class AndroidDevice } nativeWidth = _nativeWidth; nativeHeight = _nativeHeight; - - final float aspect = 0.75f; - final boolean isLetterboxed = ( (float) nativeHeight / (float) nativeWidth ) > aspect; - nativeWidthOriginal = isLetterboxed ? nativeWidth : Math.round( nativeHeight / aspect ); - nativeHeightOriginal = isLetterboxed ? Math.round( nativeWidth * aspect ) : nativeHeight; } public static boolean isAndroidTv() diff --git a/Android/src/emu/project64/jni/NativeVideo.java b/Android/src/emu/project64/jni/NativeVideo.java index 39432d44a..9f6b37838 100644 --- a/Android/src/emu/project64/jni/NativeVideo.java +++ b/Android/src/emu/project64/jni/NativeVideo.java @@ -21,9 +21,10 @@ public class NativeVideo { static { - System.loadLibrary( "Project64-gfx-glide64" ); + System.loadLibrary( "Project64-gfx" ); } + public static native void UpdateScreenRes(int ScreenWidth, int ScreenHeight); public static native int getResolutionCount(); public static native String getResolutionName(int Index); public static native int GetScreenResWidth(int Index); diff --git a/Android/src/emu/project64/jni/VideoSettingID.java b/Android/src/emu/project64/jni/VideoSettingID.java index 71d505ea6..57becffac 100644 --- a/Android/src/emu/project64/jni/VideoSettingID.java +++ b/Android/src/emu/project64/jni/VideoSettingID.java @@ -15,8 +15,7 @@ public enum VideoSettingID // General Settings Set_vsync, Set_Rotate, Set_texenh_options, Set_wrpVRAM, Set_wrpFBO, Set_wrpAnisotropic, Set_autodetect_ucode, Set_ucode, Set_wireframe, - Set_wfmode, Set_unk_as_red, Set_unk_clear, Set_ghq_fltr, - Set_ghq_cmpr, Set_ghq_enht, Set_ghq_hirs, Set_ghq_enht_cmpr, Set_ghq_enht_tile, + Set_wfmode, Set_ghq_fltr, Set_ghq_cmpr, Set_ghq_enht, Set_ghq_hirs, Set_ghq_enht_cmpr, Set_ghq_enht_f16bpp, Set_ghq_enht_gz, Set_ghq_enht_nobg, Set_ghq_hirs_cmpr, Set_ghq_hirs_tile, Set_ghq_hirs_f16bpp, Set_ghq_hirs_gz, Set_ghq_hirs_altcrc, Set_ghq_cache_save, Set_ghq_cache_size, Set_ghq_hirs_let_texartists_fly, @@ -42,6 +41,12 @@ public enum VideoSettingID //RDB Setting Set_ucodeLookup, + + //Logging Settings + Set_Logging_MD5, Set_Logging_Thread, Set_Logging_Path, Set_Logging_Settings, + Set_Logging_Unknown, Set_Logging_Glide64, Set_Logging_Interface, Set_Logging_Resolution, + Set_Logging_Glitch, Set_Logging_VideoRDP, Set_Logging_TLUT, Set_Logging_PNG, + Set_Logging_OGLWrapper, Set_Logging_RDPCommands, ; private int value;