Changes - SailfishOS Open Build Service

Changes of Revision 3

[-] [+]	Changed	_service:tar_git:qtscenegraph-adaptation.changes
@@ -1,3 +1,6 @@ +* Fri Sep 15 2017 sledge <sledgeas@gmail.com> - 0.7.2 +- [customcontext] Make hybris textures work on devices without BGRA. MER#1760 + * Thu May 19 2016 Gunnar Sletta <gunnar.sletta@jollamobile.com> - 0.6.6 - [sgadaptation] Update to latest upstream. Contributes to JB#34869.
[-] [+]	Changed	_service:tar_git:qtscenegraph-adaptation-droid.spec ^
@@ -1,6 +1,6 @@ Name: qtscenegraph-adaptation Summary: Scenegraph adaptation from playground -Version: 0.6.6 +Version: 0.7.2 Release: 1%{?dist} Group: Qt/Qt License: LGPLv2.1 with exception or GPLv3
[-] [+]	Changed	_service ^
@@ -1,10 +1,10 @@ <services> <service name="webhook"> - <param name="repourl">https://github.com/mer-hybris/qtscenegraph-adaptation</param> + <param name="repourl">https://git.merproject.org/mer-core/qtscenegraph-adaptation.git</param> <param name="branch">master</param> </service> <service name="tar_git"> - <param name="url">https://github.com/mer-hybris/qtscenegraph-adaptation</param> + <param name="url">https://git.merproject.org/mer-core/qtscenegraph-adaptation.git</param> <param name="branch">master</param> <param name="revision"/> <param name="token"/>
[-] [+]	Changed	_service:tar_git:qtscenegraph-adaptation-0.7.2.tar.bz2/customcontext/texture/hybristexture.cpp ^
@@ -67,6 +67,7 @@ #define EGL_NATIVE_BUFFER_HYBRIS 0x3140 +static bool customcontext_no_bgra = !qgetenv("QT_OPENGL_NO_BGRA").isEmpty(); namespace CustomContext { @@ -101,16 +102,30 @@ eglHybrisReleaseNativeBuffer = (_eglHybrisReleaseNativeBuffer) eglGetProcAddress("eglHybrisReleaseNativeBuffer"); } -NativeBuffer::NativeBuffer(const QImage &image) +NativeBuffer::NativeBuffer(const QImage &image_in) { - hasAlpha = image.hasAlphaChannel(); - const QImage::Format iformat = image.format(); - format = iformat == QImage::Format_RGBA8888_Premultiplied + const QImage::Format iformat = image_in.format(); + QImage image_swapped; + bool image_is_rgba = iformat == QImage::Format_RGBA8888_Premultiplied \|\| iformat == QImage::Format_RGBX8888 - \|\| iformat == QImage::Format_RGBA8888 - ? HYBRIS_PIXEL_FORMAT_RGBA_8888 - : HYBRIS_PIXEL_FORMAT_BGRA_8888; + \|\| iformat == QImage::Format_RGBA8888; + const QImage &image = (customcontext_no_bgra && !image_is_rgba) ? image_swapped : image_in; int usage = HYBRIS_USAGE_SW_READ_RARELY \| HYBRIS_USAGE_SW_WRITE_RARELY \| HYBRIS_USAGE_HW_TEXTURE; + + hasAlpha = image.hasAlphaChannel(); + + if (customcontext_no_bgra && !image_is_rgba) { + image_swapped = image_in.rgbSwapped(); + } + + if (!customcontext_no_bgra) { + format = image_is_rgba + ? HYBRIS_PIXEL_FORMAT_RGBA_8888 + : HYBRIS_PIXEL_FORMAT_BGRA_8888; + } else { + format = HYBRIS_PIXEL_FORMAT_RGBA_8888; + } + width = image.width(); height = image.height(); stride = 0;