From 323b8498ad42c94cb8fe6e93a633ef093a53b081 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Fri, 1 Oct 2021 17:22:04 +0200
Subject: [PATCH] Revert "render/drm_format_set: add wlr_drm_format_has"

This reverts commit 833437d5921339f2862ccfb0493617630ea3937d.
---
 include/render/drm_format_set.h |  1 -
 render/drm_format_set.c         | 23 +++++++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/include/render/drm_format_set.h b/include/render/drm_format_set.h
index c94c2af2..c438722b 100644
--- a/include/render/drm_format_set.h
+++ b/include/render/drm_format_set.h
@@ -4,7 +4,6 @@
 #include <wlr/render/drm_format_set.h>
 
 struct wlr_drm_format *wlr_drm_format_create(uint32_t format);
-bool wlr_drm_format_has(const struct wlr_drm_format *fmt, uint64_t modifier);
 bool wlr_drm_format_add(struct wlr_drm_format **fmt_ptr, uint64_t modifier);
 struct wlr_drm_format *wlr_drm_format_dup(const struct wlr_drm_format *format);
 /**
diff --git a/render/drm_format_set.c b/render/drm_format_set.c
index daded20b..bd8f0cb7 100644
--- a/render/drm_format_set.c
+++ b/render/drm_format_set.c
@@ -48,7 +48,13 @@ bool wlr_drm_format_set_has(const struct wlr_drm_format_set *set,
 		return true;
 	}
 
-	return wlr_drm_format_has(fmt, modifier);
+	for (size_t i = 0; i < fmt->len; ++i) {
+		if (fmt->modifiers[i] == modifier) {
+			return true;
+		}
+	}
+
+	return false;
 }
 
 bool wlr_drm_format_set_add(struct wlr_drm_format_set *set, uint32_t format,
@@ -100,15 +106,6 @@ struct wlr_drm_format *wlr_drm_format_create(uint32_t format) {
 	return fmt;
 }
 
-bool wlr_drm_format_has(const struct wlr_drm_format *fmt, uint64_t modifier) {
-	for (size_t i = 0; i < fmt->len; ++i) {
-		if (fmt->modifiers[i] == modifier) {
-			return true;
-		}
-	}
-	return false;
-}
-
 bool wlr_drm_format_add(struct wlr_drm_format **fmt_ptr, uint64_t modifier) {
 	struct wlr_drm_format *fmt = *fmt_ptr;
 
@@ -116,8 +113,10 @@ bool wlr_drm_format_add(struct wlr_drm_format **fmt_ptr, uint64_t modifier) {
 		return true;
 	}
 
-	if (wlr_drm_format_has(fmt, modifier)) {
-		return true;
+	for (size_t i = 0; i < fmt->len; ++i) {
+		if (fmt->modifiers[i] == modifier) {
+			return true;
+		}
 	}
 
 	if (fmt->len == fmt->cap) {