diff -Naur mythtv-master-20181124-gb89d3b6-old/mythtv/libs/libmythui/mythrender_opengl.cpp mythtv-master-20181124-gb89d3b6-new/mythtv/libs/libmythui/mythrender_opengl.cpp
old
|
new
|
|
128 | 128 | LOG(VB_GENERAL, LOG_INFO, "OpenGL ES2 forced for Android"); |
129 | 129 | #elif defined USE_OPENGL_QT5 && defined USING_OPENGLES |
130 | 130 | int openGLVersionFlags = QGLFormat::OpenGL_ES_Version_2_0; |
| 131 | LOG(VB_GENERAL, LOG_INFO, "Opening OpenGL ES2"); |
131 | 132 | #else |
132 | 133 | // Check OpenGL version supported |
133 | 134 | QGLWidget *dummy = new QGLWidget; |
… |
… |
|
282 | 283 | m_window = w->windowHandle(); |
283 | 284 | } |
284 | 285 | |
285 | | #ifdef ANDROID |
| 286 | #ifdef USING_OPENGLES |
286 | 287 | // change all window surfacetypes to OpenGLSurface |
287 | 288 | // otherwise the raster gets painted on top of the GL surface |
288 | 289 | m_window->setSurfaceType(QWindow::OpenGLSurface); |
… |
… |
|
306 | 307 | { |
307 | 308 | setDevice(w); |
308 | 309 | |
309 | | #ifdef ANDROID |
| 310 | #ifdef USING_OPENGLES |
310 | 311 | // change all window surfacetypes to OpenGLSurface |
311 | 312 | // otherwise the raster gets painted on top of the GL surface |
312 | 313 | m_window->setSurfaceType(QWindow::OpenGLSurface); |
diff -Naur mythtv-master-20181124-gb89d3b6-old/mythtv/libs/libmythui/mythrender_opengl.h mythtv-master-20181124-gb89d3b6-new/mythtv/libs/libmythui/mythrender_opengl.h
old
|
new
|
|
10 | 10 | // will exclude it for Raspberry Pi. With this commented, all |
11 | 11 | // code that depends on USE_OPENGL_QT5 will be bypassed and maybe can |
12 | 12 | // be removed later. |
13 | | #if defined USING_OPENGLES && QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) && defined(ANDROID) |
| 13 | #if defined USING_OPENGLES && QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) |
14 | 14 | #define USE_OPENGL_QT5 |
15 | 15 | #include <QOpenGLContext> |
16 | 16 | #else |