Bug 1944490 [Linux] Ensure DMABufFormats provides basic dmabuf formats r=emilio

Differential Revision: https://phabricator.services.mozilla.com/D236688

Author: stransky

widget/gtk/DMABufFormats.cpp

@@ -151,7 +151,6 @@ class DMABufFeedback final {
     }
   }
   DRMFormat* GetFormat(uint32_t aFormat, bool aRequestScanoutFormat) {
-    MOZ_ASSERT(!mPendingTranche);
     for (const auto& tranche : mTranches) {
       if (aRequestScanoutFormat && !tranche->IsScanout()) {
         continue;
@@ -306,9 +305,8 @@ static const struct zwp_linux_dmabuf_v1_listener dmabuf_v3_listener = {
 
 DRMFormat* DMABufFormats::GetFormat(uint32_t aFormat,
                                     bool aRequestScanoutFormat) {
-  return mDMABufFeedback
-             ? mDMABufFeedback->GetFormat(aFormat, aRequestScanoutFormat)
-             : nullptr;
+  MOZ_DIAGNOSTIC_ASSERT(mDMABufFeedback);
+  return mDMABufFeedback->GetFormat(aFormat, aRequestScanoutFormat);
 }
 
 void DMABufFormats::InitFeedback(zwp_linux_dmabuf_v1* aDMABuf,
@@ -337,6 +335,29 @@ void DMABufFormats::InitV3Done() {
   PendingDMABufFeedbackDone();
 }
 
+void DMABufFormats::EnsureBasicFormats() {
+  MOZ_DIAGNOSTIC_ASSERT(!mPendingDMABufFeedback,
+                        "Can't add extra formats during init!");
+  if (!mDMABufFeedback) {
+    mDMABufFeedback = MakeUnique<DMABufFeedback>();
+  }
+  if (!GetFormat(GBM_FORMAT_XRGB8888)) {
+    LOGDMABUF(
+        ("DMABufFormats::EnsureBasicFormats(): GBM_FORMAT_XRGB8888 is missing, "
+         "adding."));
+    mDMABufFeedback->PendingTranche()->AddFormat(GBM_FORMAT_XRGB8888,
+                                                 DRM_FORMAT_MOD_INVALID);
+  }
+  if (!GetFormat(GBM_FORMAT_ARGB8888)) {
+    LOGDMABUF(
+        ("DMABufFormats::EnsureBasicFormats(): GBM_FORMAT_ARGB8888 is missing, "
+         "adding."));
+    mDMABufFeedback->PendingTranche()->AddFormat(GBM_FORMAT_ARGB8888,
+                                                 DRM_FORMAT_MOD_INVALID);
+  }
+  mDMABufFeedback->PendingTrancheDone();
+}
+
 DMABufFormats::DMABufFormats() {}
 
 DMABufFormats::~DMABufFormats() {

widget/gtk/DMABufFormats.h

@@ -21,6 +21,10 @@ namespace mozilla::widget {
 class DMABufFormatTable;
 class DMABufFeedback;
 
+#ifndef DRM_FORMAT_MOD_INVALID
+#  define DRM_FORMAT_MOD_INVALID ((1ULL << 56) - 1)
+#endif
+
 // DRMFormat (fourcc) and available modifiers for it.
 // Modifiers are sorted from the most preffered one.
 class DRMFormat final {
@@ -44,7 +48,11 @@ class DRMFormat final {
     MOZ_ASSERT(!IsFormatModifierSupported(aModifier), "Added modifier twice?");
     mModifiers.AppendElement(aModifier);
   }
-  bool UseModifiers() const { return !mModifiers.IsEmpty(); }
+  bool UseModifiers() const {
+    // Don't use modifiers if we don't have any or we have an invalid one.
+    return !(mModifiers.IsEmpty() || (mModifiers.Length() == 1 ||
+                                      mModifiers[0] == DRM_FORMAT_MOD_INVALID));
+  }
   const uint64_t* GetModifiers(uint32_t& aModifiersNum) {
     aModifiersNum = mModifiers.Length();
     return mModifiers.Elements();
@@ -79,6 +87,8 @@ class DMABufFormats final {
   DRMFormat* GetFormat(uint32_t aFormat, bool aRequestScanoutFormat = false);
   DMABufFormats();
 
+  void EnsureBasicFormats();
+
  private:
   ~DMABufFormats();
 

widget/gtk/DMABufLibWrapper.cpp

@@ -246,9 +246,8 @@ bool DMABufDevice::IsDMABufWebGLEnabled() {
 #ifdef MOZ_WAYLAND
 void DMABufDevice::SetModifiersToGfxVars() {
   RefPtr<DMABufFormats> formats = WaylandDisplayGet()->GetDMABufFormats();
-  if (!formats) {
-    return;
-  }
+  MOZ_RELEASE_ASSERT(formats, "Missing dmabuf formats!");
+
   if (DRMFormat* format = formats->GetFormat(GBM_FORMAT_XRGB8888)) {
     mFormatRGBX = new DRMFormat(*format);
     gfxVars::SetDMABufModifiersXRGB(*format->GetModifiers());
@@ -272,8 +271,10 @@ void DMABufDevice::DisableDMABufWebGL() { sUseWebGLDmabufBackend = false; }
 RefPtr<DRMFormat> DMABufDevice::GetDRMFormat(int32_t aFOURCCFormat) {
   switch (aFOURCCFormat) {
     case GBM_FORMAT_XRGB8888:
+      MOZ_DIAGNOSTIC_ASSERT(mFormatRGBX, "Missing RGBX dmabuf format!");
       return mFormatRGBX;
     case GBM_FORMAT_ARGB8888:
+      MOZ_DIAGNOSTIC_ASSERT(mFormatRGBA, "Missing RGBA dmabuf format!");
       return mFormatRGBA;
     default:
       gfxCriticalNoteOnce << "DMABufDevice::GetDRMFormat() unknow format: "

widget/gtk/DMABufLibWrapper.h

@@ -23,10 +23,6 @@ extern mozilla::LazyLogModule gDmabufLog;
 #  define LOGDMABUF(args)
 #endif /* MOZ_LOGGING */
 
-#ifndef DRM_FORMAT_MOD_INVALID
-#  define DRM_FORMAT_MOD_INVALID ((1ULL << 56) - 1)
-#endif
-
 namespace mozilla {
 namespace widget {
 

widget/gtk/DMABufSurface.cpp

@@ -557,6 +557,8 @@ bool DMABufSurfaceRGBA::Create(int aWidth, int aHeight,
                                                      : GBM_FORMAT_XRGB8888;
   RefPtr<DRMFormat> format = GetDMABufDevice()->GetDRMFormat(mFOURCCFormat);
   if (!format) {
+    LOGDMABUF(("DMABufSurfaceRGBA::Create(): Missing drm format 0x%x!",
+               mFOURCCFormat));
     return false;
   }
   return Create(aWidth, aHeight, format, aDMABufSurfaceFlags);

widget/gtk/nsWaylandDisplay.cpp

@@ -413,7 +413,6 @@ void nsWaylandDisplay::SetDmabuf(zwp_linux_dmabuf_v1* aDmabuf, int aVersion) {
     return;
   }
   mDmabuf = aDmabuf;
-  mFormats = new DMABufFormats();
   mDmabufIsFeedback =
       (aVersion >= ZWP_LINUX_DMABUF_V1_GET_DEFAULT_FEEDBACK_SINCE_VERSION);
   if (mDmabufIsFeedback) {
@@ -423,6 +422,13 @@ void nsWaylandDisplay::SetDmabuf(zwp_linux_dmabuf_v1* aDmabuf, int aVersion) {
   }
 }
 
+void nsWaylandDisplay::EnsureDMABufFormats() {
+  if (mDmabuf && !mDmabufIsFeedback) {
+    mFormats->InitV3Done();
+  }
+  mFormats->EnsureBasicFormats();
+}
+
 void nsWaylandDisplay::SetXdgActivation(xdg_activation_v1* aXdgActivation) {
   mXdgActivation = aXdgActivation;
 }
@@ -646,13 +652,12 @@ nsWaylandDisplay::nsWaylandDisplay(wl_display* aDisplay)
   // in a similar fashion
   wl_log_set_handler_client(WlLogHandler);
 
+  mFormats = new DMABufFormats();
   mRegistry = wl_display_get_registry(mDisplay);
   wl_registry_add_listener(mRegistry, &registry_listener, this);
   wl_display_roundtrip(mDisplay);
   wl_display_roundtrip(mDisplay);
-  if (mDmabuf && !mDmabufIsFeedback) {
-    mFormats->InitV3Done();
-  }
+  EnsureDMABufFormats();
 
   for (auto& e : mSupportedTransfer) {
     e = -1;

widget/gtk/nsWaylandDisplay.h

@@ -108,6 +108,7 @@ class nsWaylandDisplay {
   }
   RefPtr<DMABufFormats> GetDMABufFormats() const { return mFormats; }
   bool HasDMABufFeedback() const { return mDmabufIsFeedback; }
+  void EnsureDMABufFormats();
 
   ~nsWaylandDisplay();