only report error from gbm_surface_create_with_modifiers if `gbm_su…

…rface_create` fails too
ardera · Sep 16, 2024 · 382ea68 · 382ea68
1 parent 94e4540
commit 382ea68
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/src/egl_gbm_render_surface.c b/src/egl_gbm_render_surface.c
@@ -146,6 +146,7 @@ static int egl_gbm_render_surface_init(
     }
 #endif
 
+    int with_modifiers_errno;
     gbm_surface = NULL;
     if (allowed_modifiers != NULL) {
         gbm_surface = gbm_surface_create_with_modifiers(
@@ -157,11 +158,10 @@ static int egl_gbm_render_surface_init(
             n_allowed_modifiers
         );
         if (gbm_surface == NULL) {
-            ok = errno;
-            LOG_ERROR("Couldn't create GBM surface for rendering. gbm_surface_create_with_modifiers: %s\n", strerror(ok));
-            LOG_ERROR("Will retry without modifiers\n");
+            with_modifiers_errno = errno;
         }
     }
+
     if (gbm_surface == NULL) {
         gbm_surface = gbm_surface_create(
             gbm_device,
@@ -171,8 +171,17 @@ static int egl_gbm_render_surface_init(
             GBM_BO_USE_RENDERING | GBM_BO_USE_SCANOUT
         );
         if (gbm_surface == NULL) {
-            ok = errno;
-            LOG_ERROR("Couldn't create GBM surface for rendering. gbm_surface_create: %s\n", strerror(ok));
+            ok = errno ? errno : EIO;
+            if (allowed_modifiers != NULL) {
+                LOG_ERROR(
+                    "Couldn't create GBM surface for rendering. gbm_surface_create_with_modifiers: %s, gbm_surface_create: %s\n",
+                    strerror(with_modifiers_errno),
+                    strerror(ok)
+                );
+            } else {
+                LOG_ERROR("Couldn't create GBM surface for rendering. gbm_surface_create: %s\n", strerror(ok));
+            }
+
             return ok;
         }
     }