[Scummvm-git-logs] scummvm branch-2-0 -> 4fcf187c2ea0bc4003b1b06f4a39836d7d787d6f

[rsn8887]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9b2517e685 PSP2: fix building with latest SDL2 for Vita
9dfa5b5c0d PSP2: fix odd resolutions on PSP2, fixes Phantasmagoria
4fcf187c2e PSP2: fix clipping and display quality for odd resolutions (Phantasmagoria)


Commit: 9b2517e6854cdf02a10906e2774eb2318425d3fe
    https://github.com/scummvm/scummvm/commit/9b2517e6854cdf02a10906e2774eb2318425d3fe
Author: rsn8887 (rsn8887 at users.noreply.github.com)
Date: 2017-12-02T15:20:21-06:00

Commit Message:
PSP2: fix building with latest SDL2 for Vita

(cherry picked from commit 98147a6c0858d677b4b5a78b592f8a200e955a5b)

Changed paths:
    configure


diff --git a/configure b/configure
index 9589152..4b9919f 100755
--- a/configure
+++ b/configure
@@ -3414,6 +3414,7 @@ case $_backend in
 		append_var LIBS "-lSceSysmodule_stub -lSceDisplay_stub -lSceGxm_stub"
 		append_var LIBS "-lSceAudio_stub -lSceCtrl_stub -lScePower_stub"
 		append_var LIBS "-lSceNet_stub -lSceNetCtl_stub -lSceAppMgr_stub -lScePgf_stub"
+		append_var LIBS "-lSceTouch_stub"
 		append_var DEFINES "-DSDL_BACKEND"
 		add_line_to_config_mk "SDL_BACKEND = 1"
 		add_line_to_config_mk "USE_SDL2 = 1"


Commit: 9dfa5b5c0d2b296dceb5b25ec9487b19966faa47
    https://github.com/scummvm/scummvm/commit/9dfa5b5c0d2b296dceb5b25ec9487b19966faa47
Author: rsn8887 (rsn8887 at users.noreply.github.com)
Date: 2017-12-02T15:20:43-06:00

Commit Message:
PSP2: fix odd resolutions on PSP2, fixes Phantasmagoria

(cherry picked from commit d73437c293c2f47cab48c46f844eb6ba0ad95528)

Changed paths:
    backends/graphics/psp2sdl/psp2sdl-graphics.cpp


diff --git a/backends/graphics/psp2sdl/psp2sdl-graphics.cpp b/backends/graphics/psp2sdl/psp2sdl-graphics.cpp
index affcf9d..f7d6bcb 100644
--- a/backends/graphics/psp2sdl/psp2sdl-graphics.cpp
+++ b/backends/graphics/psp2sdl/psp2sdl-graphics.cpp
@@ -459,6 +459,10 @@ void PSP2SdlGraphicsManager::setAspectRatioCorrection(bool enable) {
 }
 
 SDL_Surface *PSP2SdlGraphicsManager::SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags) {
+	// Vita requires resolution to be divisible by eight
+	width-=width%8;
+	height-=height%8;
+
 	SDL_Surface *screen = SurfaceSdlGraphicsManager::SDL_SetVideoMode(width, height, bpp, flags);
 	
 	if (screen != nullptr) {


Commit: 4fcf187c2ea0bc4003b1b06f4a39836d7d787d6f
    https://github.com/scummvm/scummvm/commit/4fcf187c2ea0bc4003b1b06f4a39836d7d787d6f
Author: rsn8887 (rsn8887 at users.noreply.github.com)
Date: 2017-12-02T15:20:52-06:00

Commit Message:
PSP2: fix clipping and display quality for odd resolutions (Phantasmagoria)

(cherry picked from commit c78fa86860f55ab28554327f0da310a825041655)

Changed paths:
    backends/graphics/psp2sdl/psp2sdl-graphics.cpp
    backends/platform/sdl/psp2/psp2.cpp


diff --git a/backends/graphics/psp2sdl/psp2sdl-graphics.cpp b/backends/graphics/psp2sdl/psp2sdl-graphics.cpp
index f7d6bcb..4be48b5 100644
--- a/backends/graphics/psp2sdl/psp2sdl-graphics.cpp
+++ b/backends/graphics/psp2sdl/psp2sdl-graphics.cpp
@@ -459,9 +459,6 @@ void PSP2SdlGraphicsManager::setAspectRatioCorrection(bool enable) {
 }
 
 SDL_Surface *PSP2SdlGraphicsManager::SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags) {
-	// Vita requires resolution to be divisible by eight
-	width-=width%8;
-	height-=height%8;
 
 	SDL_Surface *screen = SurfaceSdlGraphicsManager::SDL_SetVideoMode(width, height, bpp, flags);
 	
@@ -470,6 +467,7 @@ SDL_Surface *PSP2SdlGraphicsManager::SDL_SetVideoMode(int width, int height, int
 		_vitatex_hwscreen = vita2d_create_empty_texture_format(width, height, SCE_GXM_TEXTURE_FORMAT_R5G6B5);
 		_sdlpixels_hwscreen = screen->pixels; // for SDL_FreeSurface...
 		screen->pixels = vita2d_texture_get_datap(_vitatex_hwscreen);
+		screen->pitch = vita2d_texture_get_stride(_vitatex_hwscreen);
 		updateShader();
 	}
 	return screen;
diff --git a/backends/platform/sdl/psp2/psp2.cpp b/backends/platform/sdl/psp2/psp2.cpp
index 3c0cb91..94b06e6 100644
--- a/backends/platform/sdl/psp2/psp2.cpp
+++ b/backends/platform/sdl/psp2/psp2.cpp
@@ -101,7 +101,7 @@ void OSystem_PSP2::initBackend() {
 		ConfMan.setInt("joystick_deadzone", 2);
 	}
 	if (!ConfMan.hasKey("shader")) {
-		ConfMan.setInt("shader", 0);
+		ConfMan.setInt("shader", 2);
 	}
 
 	// Create the savefile manager