summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-05-12 11:04:46 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-05-15 21:38:48 +0000
commitfd79b4ff1369724b524b22ca3d5f44a819b98b7a (patch)
tree649990b14623fec8e7a27eebf5158be62582fbc4
parent9ca5d6b5f011d1b4aa916bf5c57338d0fba4aec9 (diff)
Disable Pepper using OpenGL images on macOS
We don't support textures in the GL_TEXTURE_RECTANGLE_ARB texture target which is used by Pepper now unless explicitly disabled. Task-number: QTBUG-60706 Change-Id: I56c1ba124e9ed666248912a20cf6db0230e6d981 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--src/core/web_engine_context.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index edd09f65..2748d2a0 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -328,6 +328,8 @@ WebEngineContext::WebEngineContext()
// Accelerated decoding currently does not work on macOS due to issues with OpenGL Rectangle
// texture support. See QTBUG-60002.
parsedCommandLine->AppendSwitch(switches::kDisableAcceleratedVideoDecode);
+ // Same problem with Pepper using OpenGL images.
+ parsedCommandLine->AppendSwitch(switches::kDisablePepper3DImageChromium);
#endif
if (useEmbeddedSwitches) {