Merge pull request #1576 from residualvm/bugfix/amigaos-video

AMIGAOS4: Use GL_UNSIGNED_BYTE for uploading video frames
This commit is contained in:
Dries Harnie 2019-09-26 19:10:09 +02:00 committed by GitHub
commit 15ae20db9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1584,8 +1584,14 @@ void GfxOpenGL::prepareMovieFrame(Graphics::Surface *frame) {
// Aspyr Logo format
if (frame->format == Graphics::PixelFormat(4, 8, 8, 8, 0, 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;
dataType = GL_UNSIGNED_INT_8_8_8_8_REV;