[Scummvm-git-logs] scummvm master -> 33572861c22ce6b767192785c451ab588782695e

[somaen]

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

Summary:
33572861c2 GRIM: Fix PixelFormat lookup during Remastered's startup.


Commit: 33572861c22ce6b767192785c451ab588782695e
    https://github.com/scummvm/scummvm/commit/33572861c22ce6b767192785c451ab588782695e
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2020-11-22T22:31:35+01:00

Commit Message:
GRIM: Fix PixelFormat lookup during Remastered's startup.

Grim Fandango Remastered has an alpha channel in the
video that plays as intro.

This makes Grim Fandango Remastered start, although there
are still quite a few issues to fix.

Changed paths:
    engines/grim/gfx_opengl.cpp


diff --git a/engines/grim/gfx_opengl.cpp b/engines/grim/gfx_opengl.cpp
index 64d474eb99..4f69f8ecc0 100644
--- a/engines/grim/gfx_opengl.cpp
+++ b/engines/grim/gfx_opengl.cpp
@@ -1745,6 +1745,16 @@ void GfxOpenGL::prepareMovieFrame(Graphics::Surface *frame) {
 		// AmigaOS' MiniGL does not understand GL_UNSIGNED_INT_8_8_8_8 yet.
 		format = GL_BGRA;
 		dataType = GL_UNSIGNED_BYTE;
+#endif
+	// Used by Grim Fandango Remastered
+	} else if (frame->format == Graphics::PixelFormat(4, 8, 8, 8, 8, 8, 16, 24, 0)) {
+#if !defined(__amigaos4__)
+		format = GL_BGRA;
+		dataType = GL_UNSIGNED_INT_8_8_8_8;
+#else
+		// AmigaOS' MiniGL does not understand GL_UNSIGNED_INT_8_8_8_8 yet.
+		format = GL_BGRA;
+		dataType = GL_UNSIGNED_BYTE;
 #endif
 	} else if (frame->format == Graphics::PixelFormat(4, 8, 8, 8, 0, 16, 8, 0, 0)) {
 		format = GL_BGRA;