ARM Support without GLSL

Source/Core/DolphinWX/CMakeLists.txt

@@ -10,21 +10,21 @@ set(LIBS	core
 			${GTK2_LIBRARIES}
 			${XRANDR_LIBRARIES}
 			${X11_LIBRARIES})
-
-if(SDL2_FOUND)
-	# Using shared SDL2
-	set(LIBS	${LIBS} ${SDL2_LIBRARY})
-else(SDL2_FOUND)
-	if(SDL_FOUND)
-		# Using shared SDL
-		set(LIBS	${LIBS} ${SDL_LIBRARY})
-	else(SDL_FOUND)
-		# Using static SDL from Externals
-		set(LIBS	${LIBS} SDL)
+if(NOT ANDROID)
+	if(SDL2_FOUND)
+		# Using shared SDL2
+		set(LIBS	${LIBS} ${SDL2_LIBRARY})
+	else(SDL2_FOUND)
+		if(SDL_FOUND)
+			# Using shared SDL
+			set(LIBS	${LIBS} ${SDL_LIBRARY})
+		else(SDL_FOUND)
+			# Using static SDL from Externals
+			set(LIBS	${LIBS} SDL)
+		endif()
 	endif()
 endif()
 
-
 if(LIBAV_FOUND)
 	set(LIBS	${LIBS} ${LIBAV_LIBRARIES})
 endif()
@@ -79,13 +79,18 @@ if(wxWidgets_FOUND)
 
 	set(WXLIBS ${wxWidgets_LIBRARIES})
 else()
-	set(SRCS 		
-		Src/MainNoGUI.cpp)
+	if(ANDROID)
+		set(SRCS Src/MainAndroid.cpp)
+	else()
+		set(SRCS Src/MainNoGUI.cpp)
+	endif()
 endif()
 
 if(USE_EGL)
-	set(SRCS ${SRCS} Src/GLInterface/EGL.cpp
-		Src/GLInterface/X11_Util.cpp)
+	if(NOT ANDROID)
+		set(SRCS ${SRCS} Src/GLInterface/EGL_X11.cpp
+			Src/GLInterface/X11_Util.cpp)
+	endif()
 else()
 	if(WIN32)
 		set(SRCS ${SRCS} Src/GLInterface/GLW.cpp)
@@ -127,7 +132,9 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 	set_source_files_properties(${RESOURCES} PROPERTIES
 		MACOSX_PACKAGE_LOCATION Resources)
 else()
-	set(SRCS ${SRCS} Src/X11Utils.cpp)
+	if(NOT ANDROID)
+		set(SRCS ${SRCS} Src/X11Utils.cpp)
+	endif()
 endif()
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR
@@ -146,75 +153,85 @@ else()
 	set(DOLPHIN_EXE ${DOLPHIN_EXE_BASE}-nogui)
 endif()
 
-add_executable(${DOLPHIN_EXE} ${SRCS})
-target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS})
-
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-	include(BundleUtilities)
-	set(BUNDLE_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${DOLPHIN_EXE}.app)
-
-	# Ask for an application bundle.
-	set_target_properties(${DOLPHIN_EXE} PROPERTIES
-		MACOSX_BUNDLE true
-		MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in
-		)
-
-	# Install Cg framework into application bundle.
-	copy_resolved_framework_into_bundle(
-		# Our framework in "Externals" does not have "Versions/Current/" in
-		# its path; work around the missing directory levels using "././".
-		"${CMAKE_SOURCE_DIR}/Externals/Cg/Cg.framework/././Cg"
-		"${BUNDLE_PATH}/Contents/Frameworks/Cg.framework/././Cg"
-		)
-
-	# Fix up the bundle after it is finished.
-	# There does not seem to be an easy way to run CMake commands post-build,
-	# so we invoke CMake again on a generated script.
-	file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/postprocess_bundle.cmake "
-		include(BundleUtilities)
-		message(\"Fixing up application bundle: ${BUNDLE_PATH}\")
-		set(BU_CHMOD_BUNDLE_ITEMS ON)
-		fixup_bundle(\"${BUNDLE_PATH}\" \"\" \"\")
-		")
-	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
-		COMMAND ${CMAKE_COMMAND} -P postprocess_bundle.cmake
-		)
-
-	# Copy data files into application bundle.
-	file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/copy_data_into_bundle.cmake "
-		file(INSTALL ${CMAKE_SOURCE_DIR}/Data/Sys ${CMAKE_SOURCE_DIR}/Data/User
-			DESTINATION ${BUNDLE_PATH}/Contents/Resources
-			)
-		file(GLOB TRANSLATION_FILES RELATIVE ${CMAKE_BINARY_DIR}
-			${CMAKE_BINARY_DIR}/*.gmo
-			)
-		foreach(TRANSLATION_FILE \${TRANSLATION_FILES})
-			string(REPLACE \".gmo\" \".lproj\" TRANSLATION_DIR
-				\${TRANSLATION_FILE}
-				)
-			# It would be better to copy to the new name as a single action,
-			# but I can't figure out a way to let CMake do that.
-			file(COPY ${CMAKE_BINARY_DIR}/\${TRANSLATION_FILE}
-				DESTINATION ${BUNDLE_PATH}/Contents/Resources/\${TRANSLATION_DIR}
-				NO_SOURCE_PERMISSIONS
-				)
-			file(RENAME
-				${BUNDLE_PATH}/Contents/Resources/\${TRANSLATION_DIR}/\${TRANSLATION_FILE}
-				${BUNDLE_PATH}/Contents/Resources/\${TRANSLATION_DIR}/dolphin-emu.mo
-				)
-		endforeach(TRANSLATION_FILE)
-		")
-	add_custom_target(CopyDataIntoBundle ALL
-		COMMAND ${CMAKE_COMMAND} -P copy_data_into_bundle.cmake
-		VERBATIM
-		)
-
-	# Install bundle into systemwide /Applications directory.
-	install(DIRECTORY ${BUNDLE_PATH} DESTINATION /Applications
-		USE_SOURCE_PERMISSIONS
-		)
+if(ANDROID)
+	add_library(${DOLPHIN_EXE} SHARED ${SRCS})
+	target_link_libraries(${DOLPHIN_EXE} 
+	log
+	android
+	"-Wl,--whole-archive"
+	${LIBS}
+	"-Wl,--no-whole-archive"
+	)
 else()
-	install(TARGETS ${DOLPHIN_EXE} RUNTIME DESTINATION ${bindir})
+	add_executable(${DOLPHIN_EXE} ${SRCS})
+	target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS})
+	if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+		include(BundleUtilities)
+		set(BUNDLE_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${DOLPHIN_EXE}.app)
+
+		# Ask for an application bundle.
+		set_target_properties(${DOLPHIN_EXE} PROPERTIES
+			MACOSX_BUNDLE true
+			MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in
+			)
+
+		# Install Cg framework into application bundle.
+		copy_resolved_framework_into_bundle(
+			# Our framework in "Externals" does not have "Versions/Current/" in
+			# its path; work around the missing directory levels using "././".
+			"${CMAKE_SOURCE_DIR}/Externals/Cg/Cg.framework/././Cg"
+			"${BUNDLE_PATH}/Contents/Frameworks/Cg.framework/././Cg"
+			)
+
+		# Fix up the bundle after it is finished.
+		# There does not seem to be an easy way to run CMake commands post-build,
+		# so we invoke CMake again on a generated script.
+		file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/postprocess_bundle.cmake "
+			include(BundleUtilities)
+			message(\"Fixing up application bundle: ${BUNDLE_PATH}\")
+			set(BU_CHMOD_BUNDLE_ITEMS ON)
+			fixup_bundle(\"${BUNDLE_PATH}\" \"\" \"\")
+			")
+		add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -P postprocess_bundle.cmake
+			)
+
+		# Copy data files into application bundle.
+		file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/copy_data_into_bundle.cmake "
+			file(INSTALL ${CMAKE_SOURCE_DIR}/Data/Sys ${CMAKE_SOURCE_DIR}/Data/User
+				DESTINATION ${BUNDLE_PATH}/Contents/Resources
+				)
+			file(GLOB TRANSLATION_FILES RELATIVE ${CMAKE_BINARY_DIR}
+				${CMAKE_BINARY_DIR}/*.gmo
+				)
+			foreach(TRANSLATION_FILE \${TRANSLATION_FILES})
+				string(REPLACE \".gmo\" \".lproj\" TRANSLATION_DIR
+					\${TRANSLATION_FILE}
+					)
+				# It would be better to copy to the new name as a single action,
+				# but I can't figure out a way to let CMake do that.
+				file(COPY ${CMAKE_BINARY_DIR}/\${TRANSLATION_FILE}
+					DESTINATION ${BUNDLE_PATH}/Contents/Resources/\${TRANSLATION_DIR}
+					NO_SOURCE_PERMISSIONS
+					)
+				file(RENAME
+					${BUNDLE_PATH}/Contents/Resources/\${TRANSLATION_DIR}/\${TRANSLATION_FILE}
+					${BUNDLE_PATH}/Contents/Resources/\${TRANSLATION_DIR}/dolphin-emu.mo
+					)
+			endforeach(TRANSLATION_FILE)
+			")
+		add_custom_target(CopyDataIntoBundle ALL
+			COMMAND ${CMAKE_COMMAND} -P copy_data_into_bundle.cmake
+			VERBATIM
+			)
+
+		# Install bundle into systemwide /Applications directory.
+		install(DIRECTORY ${BUNDLE_PATH} DESTINATION /Applications
+			USE_SOURCE_PERMISSIONS
+			)
+	else()
+		install(TARGETS ${DOLPHIN_EXE} RUNTIME DESTINATION ${bindir})
+	endif()
 endif()
 
 set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${DOLPHIN_EXE})

Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp

@@ -38,6 +38,7 @@
 #include "LogManager.h"
 #include "HW/CPU.h"
 #include "PowerPC/PowerPC.h"
+#include "PowerPC/JitInterface.h"
 #include "Debugger/PPCDebugInterface.h"
 #include "Debugger/Debugger_SymbolMap.h"
 #include "PowerPC/PPCAnalyst.h"
@@ -45,8 +46,6 @@
 #include "PowerPC/PPCSymbolDB.h"
 #include "PowerPC/SignatureDB.h"
 #include "PowerPC/PPCTables.h"
-#include "PowerPC/JitCommon/JitBase.h"
-#include "PowerPC/JitCommon/JitCache.h" // for ClearCache()
 
 #include "ConfigManager.h"
 
@@ -260,8 +259,7 @@ void CCodeWindow::SingleStep()
 {
 	if (CCPU::IsStepping())
 	{
-		if (jit)
-			jit->GetBlockCache()->InvalidateICache(PC, 4);
+		JitInterface::InvalidateICache(PC, 4);
 		CCPU::StepOpcode(&sync_event);
 		wxThread::Sleep(20);
 		// need a short wait here
@@ -492,10 +490,8 @@ void CCodeWindow::OnCPUMode(wxCommandEvent& event)
 	}
 
 	// Clear the JIT cache to enable these changes
-	if (jit)
-	{
-		jit->ClearCache();
-	}
+	JitInterface::ClearCache();
+	
 	// Update
 	UpdateButtonStates();
 }
@@ -509,7 +505,7 @@ void CCodeWindow::OnJitMenu(wxCommandEvent& event)
 		   	break;
 
 		case IDM_CLEARCODECACHE:
-			jit->ClearCache();
+			JitInterface::ClearCache();
 		   	break;
 
 		case IDM_SEARCHINSTRUCTION:

Source/Core/DolphinWX/Src/Frame.cpp

@@ -704,7 +704,7 @@ bool IsHotkey(wxKeyEvent &event, int Id)
 {
 	return (event.GetKeyCode() != WXK_NONE &&
 	        event.GetKeyCode() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[Id] &&
-	        event.GetModifiers() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[Id]);
+			event.GetModifiers() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[Id]);
 }
 
 int GetCmdForHotkey(unsigned int key)

Source/Core/DolphinWX/Src/GLInterface.h

@@ -18,9 +18,11 @@
 #define _GLINTERFACE_H_
 
 #include "Thread.h"
-
-#if defined(USE_EGL) && USE_EGL
-#include "GLInterface/EGL.h"
+#ifdef ANDROID
+#include <GLES2/gl2.h>
+#include <GLInterface/InterfaceBase.h>
+#elif defined(USE_EGL) && USE_EGL
+#include "GLInterface/EGL_X11.h"
 #elif defined(USE_WX) && USE_WX
 #include "GLInterface/WX.h"
 #elif defined(__APPLE__)
@@ -29,10 +31,13 @@
 #include "GLInterface/WGL.h"
 #elif defined(HAVE_X11) && HAVE_X11
 #include "GLInterface/GLX.h"
+#else
+#error Platform doesnt have a GLInterface
 #endif
 
 typedef struct {
-#if defined(USE_EGL) && USE_EGL // This is currently a X11/EGL implementation for desktop
+#ifdef ANDROID
+#elif defined(USE_EGL) && USE_EGL // This is currently a X11/EGL implementation for desktop
 	int screen;
 	Display *dpy;
 	Display *evdpy;

Source/Core/DolphinWX/Src/GLInterface/EGL_X11.cpp

@@ -19,7 +19,7 @@
 #include "RenderBase.h"
 
 #include "../GLInterface.h"
-#include "EGL.h"
+#include "EGL_X11.h"
 
 // Show the current FPS
 void cInterfaceEGL::UpdateFPSDisplay(const char *text)

Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h

@@ -23,11 +23,11 @@ protected:
 	u32 s_backbuffer_width;
 	u32 s_backbuffer_height;
 public:
-	virtual void Swap() = 0;
-	virtual void UpdateFPSDisplay(const char *Text) = 0;
-	virtual bool Create(void *&window_handle) = 0;
-	virtual bool MakeCurrent() = 0;
-	virtual void Shutdown() = 0; 
+	virtual void Swap() {}
+	virtual void UpdateFPSDisplay(const char *Text) {}
+	virtual bool Create(void *&window_handle) { return true; }
+	virtual bool MakeCurrent() { return true; }
+	virtual void Shutdown() {} 
 
 	virtual void SwapInterval(int Interval) { }
 	virtual u32 GetBackBufferWidth() { return s_backbuffer_width; }

Source/Core/DolphinWX/Src/MainAndroid.cpp

@@ -0,0 +1,149 @@
+// Copyright (C) 2003 Dolphin Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+
+#include "Common.h"
+#include "FileUtil.h"
+
+#include "Core.h"
+#include "Host.h"
+#include "CPUDetect.h"
+#include "Thread.h"
+
+#include "PowerPC/PowerPC.h"
+#include "HW/Wiimote.h"
+
+#include "VideoBackendBase.h"
+#include "ConfigManager.h"
+#include "LogManager.h"
+#include "BootManager.h"
+
+#include <jni.h>
+#include <android/log.h>
+#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "Dolphinemu", __VA_ARGS__))
+
+bool rendererHasFocus = true;
+bool running = true;
+
+void Host_NotifyMapLoaded() {}
+void Host_RefreshDSPDebuggerWindow() {}
+
+void Host_ShowJitResults(unsigned int address){}
+
+Common::Event updateMainFrameEvent;
+void Host_Message(int Id)
+{
+}
+
+void* Host_GetRenderHandle()
+{
+	return NULL;
+}
+
+void* Host_GetInstance() { return NULL; }
+
+void Host_UpdateTitle(const char* title){};
+
+void Host_UpdateLogDisplay(){}
+
+void Host_UpdateDisasmDialog(){}
+
+void Host_UpdateMainFrame()
+{
+}
+
+void Host_UpdateBreakPointView(){}
+
+bool Host_GetKeyState(int keycode)
+{
+	return false;
+}
+
+void Host_GetRenderWindowSize(int& x, int& y, int& width, int& height)
+{
+	x = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowXPos;
+	y = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowYPos;
+	width = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth;
+	height = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight;
+}
+
+void Host_RequestRenderWindowSize(int width, int height) {}
+void Host_SetStartupDebuggingParameters()
+{
+}
+
+bool Host_RendererHasFocus()
+{
+	return true;
+}
+
+void Host_ConnectWiimote(int wm_idx, bool connect) {}
+
+void Host_SetWaitCursor(bool enable){}
+
+void Host_UpdateStatusBar(const char* _pText, int Filed){}
+
+void Host_SysMessage(const char *fmt, ...)
+{
+	va_list list;
+	char msg[512];
+
+	va_start(list, fmt);
+	vsprintf(msg, fmt, list);
+	va_end(list);
+
+	size_t len = strlen(msg);
+	if (msg[len - 1] != '\n') {
+		msg[len - 1] = '\n';
+		msg[len] = '\0';
+	}
+	LOGI(msg);
+}
+
+void Host_SetWiiMoteConnectionState(int _State) {}
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_dolphinemuactivity_main(JNIEnv *env, jobject obj)
+{
+	LogManager::Init();
+	SConfig::Init();
+	VideoBackend::PopulateList();
+	VideoBackend::ActivateBackend(SConfig::GetInstance().
+		m_LocalCoreStartupParameter.m_strVideoBackend);
+	WiimoteReal::LoadSettings();
+
+	// No use running the loop when booting fails
+	if (BootManager::BootCore(""))
+	{
+		while (PowerPC::GetState() != PowerPC::CPU_POWERDOWN)
+			updateMainFrameEvent.Wait();
+	}
+
+	WiimoteReal::Shutdown();
+	VideoBackend::ClearList();
+	SConfig::Shutdown();
+	LogManager::Shutdown();
+}
+	  
+#ifdef __cplusplus
+}
+#endif