thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add a newline to "Leaving main" message.

Browse source 
Also implement SYSPROP_DISPLAY_XRES/SYSPROP_DISPLAY_YRES for SDL.
Also fix couple of warnings.
This commit is contained in:
fp64 2022-08-16 18:22:01 -04:00
parent cf23689219
commit 5b6a14edeb
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Common/Render/TextureAtlas.h
View file

@ -3,7 +3,7 @@
#include <cstdint> #include <cstdint>
#include <cstring> #include <cstring>
#define ATLAS_MAGIC ('A' + ('T' << 8) + ('L' << 16) | ('A' << 24)) #define ATLAS_MAGIC ('A' | ('T' << 8) | ('L' << 16) | ('A' << 24))
// Metadata file structure v0: // Metadata file structure v0:
// //

5
Core/HLE/sceAudiocodec.cpp
View file

@ -187,6 +187,9 @@ void __sceAudiocodecDoState(PointerWrap &p){
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunknown-warning-option" #pragma clang diagnostic ignored "-Wunknown-warning-option"
#pragma clang diagnostic ignored "-Wsizeof-pointer-div" #pragma clang diagnostic ignored "-Wsizeof-pointer-div"
#elif defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsizeof-pointer-div"
#endif #endif
DoArray(p, codec_, s >= 2 ? count : (int)ARRAY_SIZE(codec_)); DoArray(p, codec_, s >= 2 ? count : (int)ARRAY_SIZE(codec_));
DoArray(p, ctxPtr_, s >= 2 ? count : (int)ARRAY_SIZE(ctxPtr_)); DoArray(p, ctxPtr_, s >= 2 ? count : (int)ARRAY_SIZE(ctxPtr_));
@ -197,6 +200,8 @@ void __sceAudiocodecDoState(PointerWrap &p){
} }
#ifdef __clang__ #ifdef __clang__
#pragma clang diagnostic pop #pragma clang diagnostic pop
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif #endif
delete[] codec_; delete[] codec_;
delete[] ctxPtr_; delete[] ctxPtr_;

6
SDL/SDLMain.cpp
View file

@ -388,6 +388,10 @@ int System_GetPropertyInt(SystemProperty prop) {
return KEYBOARD_LAYOUT_QWERTZ; return KEYBOARD_LAYOUT_QWERTZ;
return KEYBOARD_LAYOUT_QWERTY; return KEYBOARD_LAYOUT_QWERTY;
} }
case SYSPROP_DISPLAY_XRES:
return g_DesktopWidth;
case SYSPROP_DISPLAY_YRES:
return g_DesktopHeight;
default: default:
return -1; return -1;
} }
@ -1240,7 +1244,7 @@ int main(int argc, char *argv[]) {
#endif #endif
glslang::FinalizeProcess(); glslang::FinalizeProcess();
printf("Leaving main"); printf("Leaving main\n");
#ifdef HAVE_LIBNX #ifdef HAVE_LIBNX
socketExit(); socketExit();
#endif #endif