diff --git a/Core/Core.cpp b/Core/Core.cpp index 466c56673c..38bed275b0 100644 --- a/Core/Core.cpp +++ b/Core/Core.cpp @@ -43,6 +43,8 @@ recursive_mutex m_hInactiveMutex; #ifdef _WIN32 InputState input_state; +#else +extern InputState input_state; #endif void Core_ErrorPause() @@ -50,11 +52,6 @@ void Core_ErrorPause() Core_UpdateState(CORE_ERROR); } -void Core_Pause() -{ - Core_EnableStepping(true); -} - void Core_Halt(const char *msg) { Core_EnableStepping(true); @@ -100,7 +97,6 @@ void UpdateScreenScale() { pixel_in_dps = (float)pixel_xres / dp_xres; } -#ifdef _WIN32 void Core_RunLoop() { while (!coreState) { @@ -109,19 +105,24 @@ void Core_RunLoop() { { lock_guard guard(input_state.lock); +#ifdef _WIN32 + // Temporary hack. if (GetAsyncKeyState(VK_ESCAPE)) { input_state.pad_buttons |= PAD_BUTTON_MENU; } else { input_state.pad_buttons &= ~PAD_BUTTON_MENU; } +#endif } NativeUpdate(input_state); } NativeRender(); // Simple throttling to not burn the GPU in the menu. +#ifdef _WIN32 if (globalUIState != UISTATE_INGAME) Sleep(15); GL_SwapBuffers(); +#endif } } @@ -208,8 +209,6 @@ reswitch: } -#endif - void Core_EnableStepping(bool step) { diff --git a/Core/Core.h b/Core/Core.h index 19fc377c51..cb49f6df39 100644 --- a/Core/Core.h +++ b/Core/Core.h @@ -23,7 +23,6 @@ // called from emu thread void Core_Run(); -void Core_Pause(); void Core_Stop(); void Core_ErrorPause(); // called from gui diff --git a/Core/Debugger/Breakpoints.cpp b/Core/Debugger/Breakpoints.cpp index ccc814cafd..e363e34892 100644 --- a/Core/Debugger/Breakpoints.cpp +++ b/Core/Debugger/Breakpoints.cpp @@ -45,7 +45,7 @@ void MemCheck::Action(u32 addr, bool write, int size, u32 pc) NOTICE_LOG(MEMMAP, "CHK %s%i at %08x (%s), PC=%08x (%s)", write ? "Write" : "Read", size * 8, addr, symbolMap.GetDescription(addr), pc, symbolMap.GetDescription(pc)); if (bBreak) { - Core_Pause(); + Core_EnableStepping(true); host->SetDebugMode(true); } } diff --git a/Qt/Native.pro b/Qt/Native.pro index cf03e5536b..dbe710511a 100755 --- a/Qt/Native.pro +++ b/Qt/Native.pro @@ -19,13 +19,9 @@ x86:!mobile_platform: { # EtcPack -SOURCES += ../native/ext/etcpack/etcdec.cpp \ - ../native/ext/etcpack/etcpack.cpp \ - ../native/ext/etcpack/image.cpp -HEADERS += ../native/ext/etcpack/etcdec.h \ - ../native/ext/etcpack/etcpack.h \ - ../native/ext/etcpack/image.h -INCLUDEPATH += ../native/ext/etcpack +SOURCES += ../native/ext/rg_etc1/rg_etc1.cpp +HEADERS += ../native/ext/rg_etc1/rg_etc1.h +INCLUDEPATH += ../native/ext/rg_etc1 # Cityhash SOURCES += ../native/ext/cityhash/city.cpp diff --git a/Qt/assets/build_ppgeatlas.sh b/Qt/assets/build_ppgeatlas.sh new file mode 100644 index 0000000000..57421aae81 --- /dev/null +++ b/Qt/assets/build_ppgeatlas.sh @@ -0,0 +1 @@ +../native/tools/build/atlastool ppge_atlasscript.txt ppge && mv ppge_atlas.cpp ppge_atlas.h ../Core/Util diff --git a/Qt/assets/icon-114.png b/Qt/assets/icon-114.png new file mode 100644 index 0000000000..bef28a2504 Binary files /dev/null and b/Qt/assets/icon-114.png differ diff --git a/Qt/assets/icon.svg b/Qt/assets/icon.svg new file mode 100644 index 0000000000..694005c9c1 --- /dev/null +++ b/Qt/assets/icon.svg @@ -0,0 +1,607 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Qt/assets/ppge_atlas.zim b/Qt/assets/ppge_atlas.zim new file mode 100644 index 0000000000..99114d6ac2 Binary files /dev/null and b/Qt/assets/ppge_atlas.zim differ diff --git a/Qt/assets/ppge_atlasscript.txt b/Qt/assets/ppge_atlasscript.txt new file mode 100644 index 0000000000..8bb6c7b075 --- /dev/null +++ b/Qt/assets/ppge_atlasscript.txt @@ -0,0 +1,8 @@ +256 +font UBUNTU24 ../android/source_assets/font/zrnic.ttf 30 +image I_CROSS ../android/source_assets/image/cross.png copy +image I_CIRCLE ../android/source_assets/image/circle.png copy +image I_SQUARE ../android/source_assets/image/square.png copy +image I_TRIANGLE ../android/source_assets/image/triangle.png copy +image I_BUTTON ../android/source_assets/image/button.png copy +image I_LOGO ../android/res/drawable-mdpi/ic_launcher.png copy diff --git a/Qt/assets/ui_atlas.zim b/Qt/assets/ui_atlas.zim new file mode 100644 index 0000000000..e450304eee Binary files /dev/null and b/Qt/assets/ui_atlas.zim differ diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp index 38233a581a..b0d8ecb981 100644 --- a/Windows/WindowsHost.cpp +++ b/Windows/WindowsHost.cpp @@ -17,6 +17,7 @@ #include "Core/Core.h" #include "Core/Config.h" +#include "Core/CoreParameter.h" #include "EmuThread.h" #include "DSoundStream.h" #include "WindowsHost.h" @@ -154,8 +155,7 @@ static std::string SymbolMapFilename(const char *currentFilename) bool WindowsHost::AttemptLoadSymbolMap() { - return false; - //return symbolMap.LoadSymbolMap(SymbolMapFilename(GetCurrentFilename()).c_str()); + return symbolMap.LoadSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str()).c_str()); } void WindowsHost::AddSymbol(std::string name, u32 addr, u32 size, int type=0)