Merge lp:~brandontschaefer/qtmir/correct-xrgb-support into lp:qtmir

[Brandon Schaefer]

Use RGBX_8888 for mir_xrgb format vs RGB32. The other issue with RGB32 is its 0xFF alpha value is getting changed/defaulted to 0x00 at some point when making the conversion.

Use RGBX_8888 for mir_xrgb format vs RGB32. The other issue with RGB32 is its 0xFF alpha value is getting changed/defaulted to 0x00 at some point when making the conversion.

[Gerry Boland (gerboland)]

Can you give me branches of SDL and an example demo which I can use to test this?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:274
http://jenkins.qa.ubuntu.com/job/qtmir-ci/143/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-amd64-ci/143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-armhf-ci/143
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-armhf-ci/143/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/143/rebuild

review: Approve (continuous-integration)

Unmerged revisions

274. By Brandon Schaefer on 2014-10-20

* Move to using RGBX_8888 for mir_xrgb pixel format

=== modified file 'src/platforms/mirserver/screen.cpp'
--- src/platforms/mirserver/screen.cpp	2014-09-10 15:04:42 +0000
+++ src/platforms/mirserver/screen.cpp	2014-10-20 18:45:02 +0000
@@ -69,14 +69,19 @@
                    "Qt doesn't support mir_pixel_format_xbgr_8888 in a big endian architecture");
         }
         break;
-        break;
     case mir_pixel_format_argb_8888:
         // 0xAARRGGBB
         return QImage::Format_ARGB32;
         break;
     case mir_pixel_format_xrgb_8888:
-        // 0xffRRGGBB
-        return QImage::Format_RGB32;
+        if (isLittleEndian()) {
+            // 0xRR,0xGG,0xBB,0xXX
+            return QImage::Format_RGBX8888;
+        } else {
+            // 0xXX,0xBB,0xGG,0xRR
+            qFatal("[mirserver QPA] "
+                   "Qt doesn't support mir_pixel_format_xrgb_8888 in a big endian architecture");
+        }
         break;
     case mir_pixel_format_bgr_888:
         qFatal("[mirserver QPA] Qt doesn't support mir_pixel_format_bgr_888");