Update v5

adrenaline_compat.h

@@ -19,8 +19,8 @@
 #ifndef __ADRENALINE_COMPAT_H__
 #define __ADRENALINE_COMPAT_H__
 
-#define ADRENALINE_VERSION_MAJOR 4
-#define ADRENALINE_VERSION_MINOR 3
+#define ADRENALINE_VERSION_MAJOR 5
+#define ADRENALINE_VERSION_MINOR 0
 #define ADRENALINE_VERSION ((ADRENALINE_VERSION_MAJOR << 16) | ADRENALINE_VERSION_MINOR)
 
 #define SCE_PSPEMU_FLASH0_PACKAGE_SIZE 0x920000

cef/systemctrl/main.c

@@ -275,6 +275,8 @@ void OnSystemStatusIdle() {
 	if (adrenaline->pops_mode) {
 		sceDisplaySetFrameBuf661((void *)0x0A000000, PSP_SCREEN_LINE, PSP_DISPLAY_PIXEL_FORMAT_8888, PSP_DISPLAY_SETBUF_NEXTFRAME);
 		memset(0xAA000000, 0, SCE_PSPEMU_FRAMEBUFFER_SIZE);
+	} else {
+		SendAdrenalineCmd(ADRENALINE_VITA_CMD_RESUME_POPS);
 	}
 }
 

cef/updater/main.c

@@ -70,25 +70,36 @@ int WriteFile(char *file, void *buf, int size) {
 int main(void) {
 	pspDebugScreenInit();
 
-	if (sctrlSEGetVersion() >= 0x00040002) {
+	if (sctrlSEGetVersion() >= 0x00050000) {
 		ErrorExit(5000, "This update or a higher one was already applied.\n");
 	}
 
-	printf("6.61 Adrenaline-4.2 Installer\n");
+	printf("6.61 Adrenaline-5 Installer\n");
 	printf("Changes:\n\n");
 
+	if (sctrlSEGetVersion() <= 0x00040002) {
+		printf("- Added 'Hide DLC's in game menu' functionality.\n");
+		printf("- Readded 'Original' graphics filtering, since PS1 games have got framedrops using custom filters.\n");
+		printf("- Fixed corrupted icons bug that was introduced in the previous update.\n");
+		printf("- Fixed bug where the framebuffer was corrupted after loading savestate.\n");
+		printf("- Adrenaline icon is now hidden in game menu.\n");
+		printf("\n");
+	}
+
 	if (sctrlSEGetVersion() <= 0x00040001) {
 		printf("- Added support for ISO sorting using 'Game Categories Lite' plugin.\n");
 		printf("- Fixed compatiblity with 'Kingdom Hearts: Birth by Sleep' english patch.\n");
+		printf("\n");
 	}
 
 	if (sctrlSEGetVersion() <= 0x00040000) {
 		printf("- Fixed bug where holding R trigger while launching Adrenaline didn't open the recovery menu.\n");
 		printf("- Fixed msfs truncation bug that caused savedata corruption for Little Big Planet and maybe other games.\n");
 		printf("- Fixed wrong scale of PS1 games on PS TV.\n");
+		printf("\n");
 	}
 
-	printf("\nPress X to install, R to exit.\n\n");
+	printf("Press X to install, R to exit.\n\n");
 
 	while (1) {
 		SceCtrlData pad;

readme.txt

@@ -22,10 +22,11 @@
   5) Press X/O on any connection name.
   6) Follow the instructions to update Adrenaline.
 
-- Changelog v4.3 -
+- Changelog v5 -
   - Added 'Hide DLC's in game menu' functionality.
+  - Readded 'Original' graphics filtering, since PS1 games have got framedrops using custom filters.
   - Fixed corrupted icons bug that was introduced in the previous update.
-  - Fixed bug where the framebuffer was corrupt after loading savestate.
+  - Fixed bug where the framebuffer was corrupted after loading savestate.
   - Adrenaline icon is now hidden in game menu.
 
 - Changelog v4.2 -

user/main.c

@@ -282,11 +282,7 @@ int AdrenalineCompat(SceSize args, void *argp) {
 				usbdevice_modid = startUsb("ux0:adrenaline/usbdevice.skprx", path, SCE_USBSTOR_VSTOR_TYPE_FAT);
 
 				// Response
-				if (usbdevice_modid < 0) {
-					res = usbdevice_modid;
-				} else {
-					res = 0;
-				}
+				res = (usbdevice_modid < 0) ? usbdevice_modid : 0;
 			} else {
 				// error already started
 				res = -1;
@@ -298,6 +294,7 @@ int AdrenalineCompat(SceSize args, void *argp) {
 				usbdevice_modid = -1;
 		} else if (request->cmd == ADRENALINE_VITA_CMD_PAUSE_POPS) {
 			ScePspemuPausePops(1);
+			SetPspemuFrameBuffer((void *)SCE_PSPEMU_FRAMEBUFFER);
 			adrenaline->draw_psp_screen_in_pops = 1;
 			ScePspemuWritebackCache(adrenaline, ADRENALINE_SIZE);
 			res = 0;
@@ -427,6 +424,9 @@ int sceCompatSuspendResumePatched(int unk) {
 	// Lock USB connection and PS button
 	sceShellUtilLock(SCE_SHELL_UTIL_LOCK_TYPE_USB_CONNECTION | SCE_SHELL_UTIL_LOCK_TYPE_PS_BTN_2);
 
+	if (!menu_open)
+		ScePspemuPausePops(0);
+
 	return TAI_CONTINUE(int, sceCompatSuspendResumeRef, unk);
 }
 
@@ -797,15 +797,17 @@ static int sceIoGetstatPatched(const char *file, SceIoStat *stat) {
 extern void *pops_data;
 
 static int sceDisplaySetFrameBufForCompatPatched(int a1, int a2, int a3, int a4, int a5, SceDisplayFrameBuf *pParam) {
-	if (pParam == NULL) {
-		static SceDisplayFrameBuf param;
-		param.size = sizeof(SceDisplayFrameBuf);
-		param.base = pops_data;
-		param.pitch = SCREEN_LINE;
-		param.pixelformat = SCE_DISPLAY_PIXELFORMAT_A8B8G8R8;
-		param.width = SCREEN_WIDTH;
-		param.height = SCREEN_HEIGHT;
-		pParam = &param;
+	if (config.graphics_filtering != 0) {
+		if (pParam == NULL) {
+			static SceDisplayFrameBuf param;
+			param.size = sizeof(SceDisplayFrameBuf);
+			param.base = pops_data;
+			param.pitch = SCREEN_LINE;
+			param.pixelformat = SCE_DISPLAY_PIXELFORMAT_A8B8G8R8;
+			param.width = SCREEN_WIDTH;
+			param.height = SCREEN_HEIGHT;
+			pParam = &param;
+		}
 	}
 
 	return TAI_CONTINUE(int, sceDisplaySetFrameBufForCompatRef, a1, a2, a3, a4, a5, pParam);

user/menu.c

@@ -64,7 +64,7 @@ static int EnterStandbyMode();
 static int OpenOfficialSettings();
 static int ExitPspEmuApplication();
 
-static char *graphics_options[] = { "Bilinear", "Sharp bilinear", "Advanced AA", "LCD3x" };
+static char *graphics_options[] = { "Original", "Bilinear", "Sharp bilinear", "Advanced AA", "LCD3x" };
 static char *screen_mode_options[] = { "Original", "Normal", "Zoom", "Full" };
 static char *no_yes_options[] = { "No", "Yes" };
 static char *yes_no_options[] = { "Yes", "No" };
@@ -416,7 +416,7 @@ int AdrenalineDraw(SceSize args, void *argp) {
 
 	while (1) {
 		// Do not draw if dialog is running
-		if (sceCommonDialogIsRunning()) {
+		if (sceCommonDialogIsRunning() || (config.graphics_filtering == 0 && menu_open == 0)) {
 			sceDisplayWaitVblankStart();
 			continue;
 		}
@@ -449,13 +449,13 @@ int AdrenalineDraw(SceSize args, void *argp) {
 		vita2d_clear_screen();
 
 		// Select shader
-		if (config.graphics_filtering == 0)
+		if (config.graphics_filtering == 1)
 			shader = opaque_shader;
-		else if (config.graphics_filtering == 1)
-			shader = sharp_shader;
 		else if (config.graphics_filtering == 2)
-			shader = advanced_aa_shader;
+			shader = sharp_shader;
 		else if (config.graphics_filtering == 3)
+			shader = advanced_aa_shader;
+		else if (config.graphics_filtering == 4)
 			shader = lcd3x_shader;
 		else
 			shader = opaque_shader;