From 5bc464f610c91b59214304c9f970393c3971a4bd Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 20 Mar 2017 11:33:38 +0100 Subject: Fix OpenGL for embedded builds Sets the external ozone platform and make sure we don't set bad QT_LIBDIR defines for libEGL and libGLESv2 when not doing cross builds. Change-Id: I60eada3c93224a3aa3a105b007d669932516d331 Reviewed-by: Michal Klocek --- src/core/config/embedded_linux.pri | 2 ++ src/core/gl_surface_qt.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/core') diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri index 51d7e2671..f9b8a35d5 100644 --- a/src/core/config/embedded_linux.pri +++ b/src/core/config/embedded_linux.pri @@ -12,6 +12,8 @@ use?(gn) { enable_notifications=false \ ozone_auto_platforms=false \ ozone_platform_headless=true \ + ozone_platform_external=true \ + ozone_platform=\"eglfs\" \ toolkit_views=false use?(icecc) { diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp index 30a915598..64395d219 100644 --- a/src/core/gl_surface_qt.cpp +++ b/src/core/gl_surface_qt.cpp @@ -641,13 +641,13 @@ CreateOffscreenGLSurface(const gfx::Size& size) if (surface->Initialize()) return surface; } - + LOG(WARNING) << "Failed to create offscreen GL surface"; break; } default: break; } - LOG(ERROR) << "Requested OpenGL platform is not supported."; + LOG(ERROR) << "Requested OpenGL implementation is not supported. Implementation: " << GetGLImplementation(); Q_UNREACHABLE(); return NULL; } -- cgit v1.2.3