From c0bc770eb1dfcc6689df44438cd396721d5129fc Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Wed, 14 May 2014 17:53:59 +0200 Subject: Enable GLContextHelper and register a SurfaceFactoryQt on eAndroid This is needed to run on certain hardware that needs the shared EGL contexts to be created on the same thread. To prevent a deadlock on eAndroid only use a blocking connection if we are not on the main thread where the singleton was created, since there is a call to this from gpu_info_collector_android before the GPU thread is launched. Change-Id: I6887ad1218b8426097f454741dc5a79ee94f9d62 Reviewed-by: Jocelyn Turcotte --- src/core/surface_factory_qt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/surface_factory_qt.h') diff --git a/src/core/surface_factory_qt.h b/src/core/surface_factory_qt.h index 28a377e2c..78ccbf2e2 100644 --- a/src/core/surface_factory_qt.h +++ b/src/core/surface_factory_qt.h @@ -42,7 +42,7 @@ #ifndef SURFACE_FACTORY_QT #define SURFACE_FACTORY_QT -#if defined(USE_OZONE) +#if defined(USE_OZONE) || defined(OS_ANDROID) #include "ui/gfx/ozone/surface_factory_ozone.h" -- cgit v1.2.3