Add workaround for hardware accel under X11

tytan652 · RytoEX · commit be8e59062572 · 2025-04-01T16:44:03.000-04:00
diff --git a/browser-client.cpp b/browser-client.cpp
@@ -31,6 +31,8 @@
 #endif
 
 #if !defined(_WIN32) && !defined(__APPLE__)
+#include <obs-nix-platform.h>
+
 #include "drm-format.hpp"
 #endif
 
@@ -378,6 +380,7 @@ void BrowserClient::OnAcceleratedPaint(CefRefPtr<CefBrowser>, PaintElementType t
 		return;
 
 	struct obs_cef_video_format format = obs_cef_format_from_cef_type(info.format);
+	uint64_t modifier = info.modifier;
 
 	if (format.gs_format == GS_UNKNOWN)
 		return;
@@ -387,14 +390,19 @@ void BrowserClient::OnAcceleratedPaint(CefRefPtr<CefBrowser>, PaintElementType t
 	uint64_t *modifiers = (uint64_t *)alloca(info.plane_count * sizeof(uint64_t));
 	int *fds = (int *)alloca(info.plane_count * sizeof(int));
 
+	/* NOTE: This a workaround under X11 where the modifier is always invalid where it can mean "no modifier" in
+	 * Chromium's code. */
+	if (obs_get_nix_platform() == OBS_NIX_PLATFORM_X11_EGL && modifier == DRM_FORMAT_MOD_INVALID)
+		modifier = DRM_FORMAT_MOD_LINEAR;
+
 	for (size_t i = 0; i < kAcceleratedPaintMaxPlanes; i++) {
 		auto *plane = &info.planes[i];
 
 		strides[i] = plane->stride;
 		offsets[i] = plane->offset;
 		fds[i] = plane->fd;
 
-		modifiers[i] = info.modifier;
+		modifiers[i] = modifier;
 	}
 #endif
 
@@ -432,7 +440,7 @@ void BrowserClient::OnAcceleratedPaint(CefRefPtr<CefBrowser>, PaintElementType t
 #else
 	bs->texture = gs_texture_create_from_dmabuf(bs->width, bs->height, format.drm_format, format.gs_format,
 						    info.plane_count, fds, strides, offsets,
-						    info.modifier != DRM_FORMAT_MOD_INVALID ? modifiers : NULL);
+						    modifier != DRM_FORMAT_MOD_INVALID ? modifiers : NULL);
 #endif
 	UpdateExtraTexture();
 	obs_leave_graphics();
