RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-23 11:47:45 +00:00
Code Issues Releases Wiki Activity

vo_opengl: drop pointless fbotex_init() function

Browse Source
This commit is contained in:
wm4 2017-08-07 14:34:18 +02:00
parent 9581fbe569
commit 41ee66d566
3 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
video/out/opengl/utils.c
View File

@ -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. // Create a texture and a FBO using the texture as color attachments.
// fmt: texture internal format // fmt: texture internal format
// Returns success. // If the parameters are the same as the previous call, do not touch it.
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.
// flags can be 0, or a combination of FBOTEX_FUZZY_W and FBOTEX_FUZZY_H. // 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. // 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, bool fbotex_change(struct fbotex *fbo, struct ra *ra, struct mp_log *log,

2
video/out/opengl/utils.h
View File

@ -69,8 +69,6 @@ struct fbotex {
int lw, lh; // logical (configured) size, <= than texture size 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); void fbotex_uninit(struct fbotex *fbo);
bool fbotex_change(struct fbotex *fbo, struct ra *ra, struct mp_log *log, bool fbotex_change(struct fbotex *fbo, struct ra *ra, struct mp_log *log,
int w, int h, const struct ra_format *fmt, int flags); int w, int h, const struct ra_format *fmt, int flags);

2
video/out/opengl/video.c
View File

@ -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); MP_VERBOSE(p, "Testing FBO format %s\n", fmt->name);
struct fbotex fbo = {0}; 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); fbotex_uninit(&fbo);
return success; return success;
} }