Title: [278408] trunk/Tools/buildstream
- Revision
- 278408
- Author
- mago...@igalia.com
- Date
- 2021-06-03 08:25:57 -0700 (Thu, 03 Jun 2021)
Log Message
REGRESSION(r275755): [GStreamer] Crashes on surfaceless i965 platforms
https://bugs.webkit.org/show_bug.cgi?id=226581
Reviewed by Philippe Normand.
Vendor potential fix for https://gitlab.freedesktop.org/mesa/mesa/-/issues/778.
* elements/sdk/mesa.bst:
* patches/mesa/0002-i965-Prevent-invalid-framebuffer-usage.patch: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/buildstream/ChangeLog (278407 => 278408)
--- trunk/Tools/buildstream/ChangeLog 2021-06-03 15:23:25 UTC (rev 278407)
+++ trunk/Tools/buildstream/ChangeLog 2021-06-03 15:25:57 UTC (rev 278408)
@@ -1,3 +1,15 @@
+2021-06-03 Miguel Gomez <mago...@igalia.com>
+
+ REGRESSION(r275755): [GStreamer] Crashes on surfaceless i965 platforms
+ https://bugs.webkit.org/show_bug.cgi?id=226581
+
+ Reviewed by Philippe Normand.
+
+ Vendor potential fix for https://gitlab.freedesktop.org/mesa/mesa/-/issues/778.
+
+ * elements/sdk/mesa.bst:
+ * patches/mesa/0002-i965-Prevent-invalid-framebuffer-usage.patch: Added.
+
2021-05-31 Carlos Garcia Campos <cgar...@igalia.com>
[Flatpak SDK] Update to libsoup3 2.99.7
Modified: trunk/Tools/buildstream/elements/sdk/mesa.bst (278407 => 278408)
--- trunk/Tools/buildstream/elements/sdk/mesa.bst 2021-06-03 15:23:25 UTC (rev 278407)
+++ trunk/Tools/buildstream/elements/sdk/mesa.bst 2021-06-03 15:25:57 UTC (rev 278408)
@@ -113,3 +113,5 @@
path: patches/mesa/mesa_libdrm_deps.patch
- kind: patch
path: patches/mesa/0001-i915-Prevent-invalid-framebuffer-usage.patch
+- kind: patch
+ path: patches/mesa/0002-i965-Prevent-invalid-framebuffer-usage.patch
Added: trunk/Tools/buildstream/patches/mesa/0002-i965-Prevent-invalid-framebuffer-usage.patch (0 => 278408)
--- trunk/Tools/buildstream/patches/mesa/0002-i965-Prevent-invalid-framebuffer-usage.patch (rev 0)
+++ trunk/Tools/buildstream/patches/mesa/0002-i965-Prevent-invalid-framebuffer-usage.patch 2021-06-03 15:25:57 UTC (rev 278408)
@@ -0,0 +1,38 @@
+From f9d0061833089ee67bdfdfa4446f7a3f46780370 Mon Sep 17 00:00:00 2001
+From: Miguel Gomez <mago...@igalia.com>
+Date: Thu, 3 Jun 2021 16:44:30 +0200
+Subject: [PATCH] i965: Prevent invalid framebuffer usage
+
+When a surfaceless context is in use, driDrawablePriv might be NULL, so needs to
+be checked before calling dri2InvalidateDrawable. Same for read calls.
+---
+ src/mesa/drivers/dri/i965/intel_buffers.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/mesa/drivers/dri/i965/intel_buffers.c b/src/mesa/drivers/dri/i965/intel_buffers.c
+index dae56e3362c..3898c32856a 100644
+--- a/src/mesa/drivers/dri/i965/intel_buffers.c
++++ b/src/mesa/drivers/dri/i965/intel_buffers.c
+@@ -42,7 +42,8 @@ intelDrawBuffer(struct gl_context *ctx)
+ * time, invalidate our DRI drawable so we'll ask for new buffers
+ * (including the fake front) before we start rendering again.
+ */
+- dri2InvalidateDrawable(brw->driContext->driDrawablePriv);
++ if (brw->driContext->driDrawablePriv)
++ dri2InvalidateDrawable(brw->driContext->driDrawablePriv);
+ intel_prepare_render(brw);
+ }
+ }
+@@ -58,7 +59,8 @@ intelReadBuffer(struct gl_context * ctx, GLenum mode)
+ * time, invalidate our DRI drawable so we'll ask for new buffers
+ * (including the fake front) before we start reading again.
+ */
+- dri2InvalidateDrawable(brw->driContext->driReadablePriv);
++ if (brw->driContext->driDrawablePriv)
++ dri2InvalidateDrawable(brw->driContext->driReadablePriv);
+ intel_prepare_render(brw);
+ }
+ }
+--
+2.31.1
+
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
