ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PSP2: Screenshots are now saved into the Photo Gallery

This commit is contained in:
Jeffrey Pfau 2016-08-21 20:08:41 -07:00
parent 34db16b483
commit 193d2d1f4a
4 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -68,6 +68,7 @@ Misc:
- Util: Add rtrim - Util: Add rtrim
- GBA Memory: Optimize Load-/StoreMultiple - GBA Memory: Optimize Load-/StoreMultiple
- 3DS: Adjustable filering - 3DS: Adjustable filering
- PSP2: Screenshots are now saved into the Photo Gallery
0.4.1: (2016-07-11) 0.4.1: (2016-07-11)
Bugfixes: Bugfixes:

22
src/core/core.c
View File

@ -21,6 +21,10 @@
#include "gba/gba.h" #include "gba/gba.h"
#endif #endif
#ifdef PSP2
#include <psp2/photoexport.h>
#endif
static struct mCoreFilter { static struct mCoreFilter {
bool (*filter)(struct VFile*); bool (*filter)(struct VFile*);
struct mCore* (*open)(void); struct mCore* (*open)(void);
@ -154,7 +158,12 @@ void mCoreTakeScreenshot(struct mCore* core) {
color_t* pixels = 0; color_t* pixels = 0;
unsigned width, height; unsigned width, height;
core->desiredVideoDimensions(core, &width, &height); core->desiredVideoDimensions(core, &width, &height);
struct VFile* vf = VDirFindNextAvailable(core->dirs.screenshot, core->dirs.baseName, "-", ".png", O_CREAT | O_TRUNC | O_WRONLY); struct VFile* vf;
#ifndef PSP2
vf = VDirFindNextAvailable(core->dirs.screenshot, core->dirs.baseName, "-", ".png", O_CREAT | O_TRUNC | O_WRONLY);
#else
vf = VFileMemChunk(0, 0);
#endif
bool success = false; bool success = false;
if (vf) { if (vf) {
core->getVideoBuffer(core, &pixels, &stride); core->getVideoBuffer(core, &pixels, &stride);
@ -162,6 +171,17 @@ void mCoreTakeScreenshot(struct mCore* core) {
png_infop info = PNGWriteHeader(png, width, height); png_infop info = PNGWriteHeader(png, width, height);
success = PNGWritePixels(png, width, height, stride, pixels); success = PNGWritePixels(png, width, height, stride, pixels);
PNGWriteClose(png, info); PNGWriteClose(png, info);
#ifdef PSP2
void* data = vf->map(vf, 0, 0);
PhotoExportParam param = {
0,
NULL,
NULL,
NULL,
{ 0 }
};
scePhotoExportFromData(data, vf->size(vf), &param, NULL, NULL, NULL, NULL, 0);
#endif
vf->close(vf); vf->close(vf);
} }
if (success) { if (success) {

2
src/platform/psp2/CMakeLists.txt
View File

@ -15,7 +15,7 @@ source_group("PS Vita-specific code" FILES ${OS_SRC})
list(APPEND CORE_VFS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/sce-vfs.c) list(APPEND CORE_VFS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/sce-vfs.c)
set(CORE_VFS_SRC ${CORE_VFS_SRC} PARENT_SCOPE) set(CORE_VFS_SRC ${CORE_VFS_SRC} PARENT_SCOPE)
set(OS_LIB -lvita2d -lSceCtrl_stub -lScePgf_stub -lSceGxm_stub -lSceDisplay_stub -lSceAudio_stub -lSceCommonDialog_stub -lSceMotion_stub -lScePower_stub -lSceSysmodule_stub -lSceTouch_stub -l${M_LIBRARY}) set(OS_LIB -lvita2d -lSceAppMgr_stub -lSceCtrl_stub -lScePgf_stub -lSceGxm_stub -lSceDisplay_stub -lSceAudio_stub -lSceCommonDialog_stub -lSceMotion_stub -lScePhotoExport_stub -lScePower_stub -lSceSysmodule_stub -lSceTouch_stub -l${M_LIBRARY})
set(OBJCOPY_CMD ${OBJCOPY} -I binary -O elf32-littlearm -B arm) set(OBJCOPY_CMD ${OBJCOPY} -I binary -O elf32-littlearm -B arm)
list(APPEND GUI_SRC ${CMAKE_CURRENT_SOURCE_DIR}/gui-font.c) list(APPEND GUI_SRC ${CMAKE_CURRENT_SOURCE_DIR}/gui-font.c)

1
src/platform/psp2/main.c
View File

@ -153,6 +153,7 @@ int main() {
sceTouchSetSamplingState(SCE_TOUCH_PORT_FRONT, SCE_TOUCH_SAMPLING_STATE_START); sceTouchSetSamplingState(SCE_TOUCH_PORT_FRONT, SCE_TOUCH_SAMPLING_STATE_START);
sceCtrlSetSamplingMode(SCE_CTRL_MODE_ANALOG_WIDE); sceCtrlSetSamplingMode(SCE_CTRL_MODE_ANALOG_WIDE);
sceSysmoduleLoadModule(SCE_SYSMODULE_PHOTO_EXPORT);
mGUIInit(&runner, "psvita"); mGUIInit(&runner, "psvita");