From 41ee66d566f92a0dfdd95189e99ea34a99d3c441 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 7 Aug 2017 14:34:18 +0200
Subject: vo_opengl: drop pointless fbotex_init() function

---
 video/out/opengl/utils.c | 11 +----------
 video/out/opengl/utils.h |  2 --
 video/out/opengl/video.c |  2 +-
 3 files changed, 2 insertions(+), 13 deletions(-)

(limited to 'video')

diff --git a/video/out/opengl/utils.c b/video/out/opengl/utils.c
index f4ea3d5472..ffc2fb3fce 100644
--- a/video/out/opengl/utils.c
+++ b/video/out/opengl/utils.c
@@ -35,16 +35,7 @@ void gl_transform_trans(struct gl_transform t, struct gl_transform *x)
 
 // Create a texture and a FBO using the texture as color attachments.
 //  fmt: texture internal format
-// Returns success.
-bool fbotex_init(struct fbotex *fbo, struct ra *ra, struct mp_log *log,
-                 int w, int h, const struct ra_format *fmt)
-{
-    assert(!fbo->tex);
-    return fbotex_change(fbo, ra, log, w, h, fmt, 0);
-}
-
-// Like fbotex_init(), except it can be called on an already initialized FBO;
-// and if the parameters are the same as the previous call, do not touch it.
+// If the parameters are the same as the previous call, do not touch it.
 // flags can be 0, or a combination of FBOTEX_FUZZY_W and FBOTEX_FUZZY_H.
 // Enabling FUZZY for W or H means the w or h does not need to be exact.
 bool fbotex_change(struct fbotex *fbo, struct ra *ra, struct mp_log *log,
diff --git a/video/out/opengl/utils.h b/video/out/opengl/utils.h
index e053fba1ae..12d77efbf8 100644
--- a/video/out/opengl/utils.h
+++ b/video/out/opengl/utils.h
@@ -69,8 +69,6 @@ struct fbotex {
     int lw, lh; // logical (configured) size, <= than texture size
 };
 
-bool fbotex_init(struct fbotex *fbo, struct ra *ra, struct mp_log *log,
-                 int w, int h, const struct ra_format *fmt);
 void fbotex_uninit(struct fbotex *fbo);
 bool fbotex_change(struct fbotex *fbo, struct ra *ra, struct mp_log *log,
                    int w, int h, const struct ra_format *fmt, int flags);
diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c
index c044e62664..6300ea84ea 100644
--- a/video/out/opengl/video.c
+++ b/video/out/opengl/video.c
@@ -3335,7 +3335,7 @@ static bool test_fbo(struct gl_video *p, const struct ra_format *fmt)
 {
     MP_VERBOSE(p, "Testing FBO format %s\n", fmt->name);
     struct fbotex fbo = {0};
-    bool success = fbotex_init(&fbo, p->ra, p->log, 16, 16, fmt);
+    bool success = fbotex_change(&fbo, p->ra, p->log, 16, 16, fmt, 0);
     fbotex_uninit(&fbo);
     return success;
 }
-- 
cgit v1.2.3