Title: [289884] trunk/Source/WebCore
- Revision
- 289884
- Author
- cl...@igalia.com
- Date
- 2022-02-16 01:39:44 -0800 (Wed, 16 Feb 2022)
Log Message
[GTK][WPE] Crashing/weird behaviour when trying to use videos as textures with ANGLE WebGL enabled
https://bugs.webkit.org/show_bug.cgi?id=236587
Reviewed by Kenneth Russell.
Disable the texture-sharing fast-path for GStreamer GL when ANGLE is
also enabled.
No new tests, no change in behaviour.
* platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp:
(WebCore::GraphicsContextGLTextureMapper::copyTextureFromMedia):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (289883 => 289884)
--- trunk/Source/WebCore/ChangeLog 2022-02-16 09:29:18 UTC (rev 289883)
+++ trunk/Source/WebCore/ChangeLog 2022-02-16 09:39:44 UTC (rev 289884)
@@ -1,3 +1,18 @@
+2022-02-16 Chris Lord <cl...@igalia.com>
+
+ [GTK][WPE] Crashing/weird behaviour when trying to use videos as textures with ANGLE WebGL enabled
+ https://bugs.webkit.org/show_bug.cgi?id=236587
+
+ Reviewed by Kenneth Russell.
+
+ Disable the texture-sharing fast-path for GStreamer GL when ANGLE is
+ also enabled.
+
+ No new tests, no change in behaviour.
+
+ * platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp:
+ (WebCore::GraphicsContextGLTextureMapper::copyTextureFromMedia):
+
2022-02-16 Ali Juma <aj...@chromium.org>
Floating point exception in RenderListBox::numVisibleItems
Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp (289883 => 289884)
--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp 2022-02-16 09:29:18 UTC (rev 289883)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp 2022-02-16 09:39:44 UTC (rev 289884)
@@ -173,7 +173,22 @@
#if ENABLE(VIDEO)
bool GraphicsContextGLTextureMapper::copyTextureFromMedia(MediaPlayer& player, PlatformGLObject outputTexture, GCGLenum outputTarget, GCGLint level, GCGLenum internalFormat, GCGLenum format, GCGLenum type, bool premultiplyAlpha, bool flipY)
{
+#if USE(ANGLE) && USE(GSTREAMER_GL)
+ UNUSED_PARAM(player);
+ UNUSED_PARAM(outputTexture);
+ UNUSED_PARAM(outputTarget);
+ UNUSED_PARAM(level);
+ UNUSED_PARAM(internalFormat);
+ UNUSED_PARAM(format);
+ UNUSED_PARAM(type);
+ UNUSED_PARAM(premultiplyAlpha);
+ UNUSED_PARAM(flipY);
+
+ // FIXME: Implement copy-free (or at least, software copy-free) texture transfer via dmabuf.
+ return false;
+#else
return player.copyVideoTextureToPlatformTexture(this, outputTexture, outputTarget, level, internalFormat, format, type, premultiplyAlpha, flipY);
+#endif
}
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
