Add eglfs-viv support for INTEGRITY

Change-Id: I5ea23eeac930dcc628047e3322061d543bddb643 Reviewed-by: Laszlo Agocs <[email protected]> Reviewed-by: Oswald Buddenhagen <[email protected]> Reviewed-by: Nikola Velinov <[email protected]>
chain78 · Jan 18, 2017 · daf2aa0 · daf2aa0
1 parent d3eec16
commit daf2aa0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/config.tests/qpa/eglfs-viv/eglfs-viv.cpp b/config.tests/qpa/eglfs-viv/eglfs-viv.cpp
@@ -42,8 +42,12 @@
 
 int main(int, char **)
 {
+#if defined(__INTEGRITY)
+    fbGetDisplay();
+#else
     // Do not rely on fbGetDisplay() since the signature has changed over time.
     // Stick to fbGetDisplayByIndex().
     fbGetDisplayByIndex(0);
+#endif
     return 0;
 }
diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp
@@ -3739,6 +3739,11 @@ QOpenGLProgramBinarySupportCheck::QOpenGLProgramBinarySupportCheck(QOpenGLContex
     : QOpenGLSharedResource(context->shareGroup()),
       m_supported(false)
 {
+// Shader cache is disabled for INTEGRITY as the driver doesn't handle
+// unaligned data.
+#if defined(Q_OS_INTEGRITY)
+    return;
+#endif
     if (QCoreApplication::testAttribute(Qt::AA_DisableShaderDiskCache)) {
         qCDebug(DBG_SHADER_CACHE, "Shader cache disabled via app attribute");
         return;

diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/qeglfsvivintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/qeglfsvivintegration.cpp
@@ -63,9 +63,11 @@ void QEglFSVivIntegration::platformInit()
 
 #ifdef Q_OS_INTEGRITY
     VivanteInit();
+    mNativeDisplay = fbGetDisplay();
+#else
+    mNativeDisplay = fbGetDisplayByIndex(framebufferIndex());
 #endif
 
-    mNativeDisplay = fbGetDisplayByIndex(framebufferIndex());
     fbGetDisplayGeometry(mNativeDisplay, &width, &height);
     mScreenSize.setHeight(height);
     mScreenSize.setWidth(width);