summaryrefslogtreecommitdiffstats
path: root/video/out
diff options
context:
space:
mode:
Diffstat (limited to 'video/out')
-rw-r--r--video/out/gpu/shader_cache.c15
-rw-r--r--video/out/gpu/utils.c2
-rw-r--r--video/out/gpu/video.c34
-rw-r--r--video/out/opengl/ra_gl.c2
4 files changed, 18 insertions, 35 deletions
diff --git a/video/out/gpu/shader_cache.c b/video/out/gpu/shader_cache.c
index 83ca11d7ad..6d0f370568 100644
--- a/video/out/gpu/shader_cache.c
+++ b/video/out/gpu/shader_cache.c
@@ -144,7 +144,7 @@ void gl_sc_reset(struct gl_shader_cache *sc)
static void sc_flush_cache(struct gl_shader_cache *sc)
{
- MP_VERBOSE(sc, "flushing shader cache\n");
+ MP_DBG(sc, "flushing shader cache\n");
for (int n = 0; n < sc->num_entries; n++) {
struct sc_entry *e = sc->entries[n];
@@ -550,15 +550,6 @@ static bool create_pass(struct gl_shader_cache *sc, struct sc_entry *entry)
void *tmp = talloc_new(NULL);
struct ra_renderpass_params params = sc->params;
- MP_VERBOSE(sc, "new shader program:\n");
- if (sc->header_text.len) {
- MP_VERBOSE(sc, "header:\n");
- mp_log_source(sc->log, MSGL_V, sc->header_text.start);
- MP_VERBOSE(sc, "body:\n");
- }
- if (sc->text.len)
- mp_log_source(sc->log, MSGL_V, sc->text.start);
-
const char *cache_header = "mpv shader cache v1\n";
char *cache_filename = NULL;
char *cache_dir = NULL;
@@ -583,7 +574,7 @@ static bool create_pass(struct gl_shader_cache *sc, struct sc_entry *entry)
cache_filename = mp_path_join(tmp, cache_dir, hashstr);
if (stat(cache_filename, &(struct stat){0}) == 0) {
- MP_VERBOSE(sc, "Trying to load shader from disk...\n");
+ MP_DBG(sc, "Trying to load shader from disk...\n");
struct bstr cachedata =
stream_read_file(cache_filename, tmp, sc->global, 1000000000);
if (bstr_eatstart0(&cachedata, cache_header))
@@ -633,7 +624,7 @@ static bool create_pass(struct gl_shader_cache *sc, struct sc_entry *entry)
if (nc.len && !bstr_equals(params.cached_program, nc)) {
mp_mkdirp(cache_dir);
- MP_VERBOSE(sc, "Writing shader cache file: %s\n", cache_filename);
+ MP_DBG(sc, "Writing shader cache file: %s\n", cache_filename);
FILE *out = fopen(cache_filename, "wb");
if (out) {
fwrite(cache_header, strlen(cache_header), 1, out);
diff --git a/video/out/gpu/utils.c b/video/out/gpu/utils.c
index 6a2abae1b2..078a31c895 100644
--- a/video/out/gpu/utils.c
+++ b/video/out/gpu/utils.c
@@ -181,7 +181,7 @@ bool ra_tex_resize(struct ra *ra, struct mp_log *log, struct ra_tex **tex,
return true;
}
- mp_verbose(log, "Resizing texture: %dx%d\n", w, h);
+ mp_dbg(log, "Resizing texture: %dx%d\n", w, h);
if (!fmt || !fmt->renderable || !fmt->linear_filter) {
mp_err(log, "Format %s not supported.\n", fmt ? fmt->name : "(unset)");
diff --git a/video/out/gpu/video.c b/video/out/gpu/video.c
index d9f1b80ae6..f80d63a8b1 100644
--- a/video/out/gpu/video.c
+++ b/video/out/gpu/video.c
@@ -1053,11 +1053,11 @@ static void pass_report_performance(struct gl_video *p)
for (int i = 0; i < VO_PASS_PERF_MAX; i++) {
struct pass_info *pass = &p->pass[i];
if (pass->desc.len) {
- MP_DBG(p, "pass '%.*s': last %dus avg %dus peak %dus\n",
- BSTR_P(pass->desc),
- (int)pass->perf.last/1000,
- (int)pass->perf.avg/1000,
- (int)pass->perf.peak/1000);
+ MP_TRACE(p, "pass '%.*s': last %dus avg %dus peak %dus\n",
+ BSTR_P(pass->desc),
+ (int)pass->perf.last/1000,
+ (int)pass->perf.avg/1000,
+ (int)pass->perf.peak/1000);
}
}
}
@@ -1393,8 +1393,8 @@ static bool pass_hook_setup_binds(struct gl_video *p, const char *name,
struct image bind_img;
if (!saved_img_find(p, bind_name, &bind_img)) {
// Clean up texture bindings and move on to the next hook
- MP_DBG(p, "Skipping hook on %s due to no texture named %s.\n",
- name, bind_name);
+ MP_TRACE(p, "Skipping hook on %s due to no texture named %s.\n",
+ name, bind_name);
p->num_pass_imgs -= t;
return false;
}
@@ -1425,7 +1425,7 @@ static struct image pass_hook(struct gl_video *p, const char *name,
saved_img_store(p, name, img);
- MP_DBG(p, "Running hooks for %s\n", name);
+ MP_TRACE(p, "Running hooks for %s\n", name);
for (int i = 0; i < p->num_tex_hooks; i++) {
struct tex_hook *hook = &p->tex_hooks[i];
@@ -1440,7 +1440,7 @@ static struct image pass_hook(struct gl_video *p, const char *name,
found:
// Check the hook's condition
if (hook->cond && !hook->cond(p, img, hook->priv)) {
- MP_DBG(p, "Skipping hook on %s due to condition.\n", name);
+ MP_TRACE(p, "Skipping hook on %s due to condition.\n", name);
continue;
}
@@ -2073,7 +2073,6 @@ static void pass_read_video(struct gl_video *p)
struct mp_rect_f src = {0.0, 0.0, p->image_params.w, p->image_params.h};
struct mp_rect_f ref = src;
gl_transform_rect(p->texture_offset, &ref);
- MP_DBG(p, "ref rect: {%f %f} {%f %f}\n", ref.x0, ref.y0, ref.x1, ref.y1);
// Explicitly scale all of the textures that don't match
for (int n = 0; n < 4; n++) {
@@ -2084,9 +2083,6 @@ static void pass_read_video(struct gl_video *p)
// exact same source rectangle.
struct mp_rect_f rect = src;
gl_transform_rect(offsets[n], &rect);
- MP_DBG(p, "rect[%d]: {%f %f} {%f %f}\n", n,
- rect.x0, rect.y0, rect.x1, rect.y1);
-
if (mp_rect_f_seq(ref, rect))
continue;
@@ -2098,8 +2094,6 @@ static void pass_read_video(struct gl_video *p)
{0.0, (ref.y1 - ref.y0) / (rect.y1 - rect.y0)}},
.t = {ref.x0, ref.y0},
};
- MP_DBG(p, "-> fix[%d] = {%f %f} + off {%f %f}\n", n,
- fix.m[0][0], fix.m[1][1], fix.t[0], fix.t[1]);
// Since the scale in texture space is different from the scale in
// absolute terms, we have to scale the coefficients down to be
@@ -2113,8 +2107,6 @@ static void pass_read_video(struct gl_video *p)
MPSWAP(double, scale.m[0][0], scale.m[1][1]);
gl_transform_trans(scale, &fix);
- MP_DBG(p, "-> scaled[%d] = {%f %f} + off {%f %f}\n", n,
- fix.m[0][0], fix.m[1][1], fix.t[0], fix.t[1]);
// Since the texture transform is a function of the texture coordinates
// to texture space, rather than the other way around, we have to
@@ -2998,8 +2990,8 @@ static void gl_video_interpolate_frame(struct gl_video *p, struct vo_frame *t,
assert(id == i);
}
- MP_DBG(p, "inter frame dur: %f vsync: %f, mix: %f\n",
- t->ideal_frame_duration, t->vsync_interval, mix);
+ MP_TRACE(p, "inter frame dur: %f vsync: %f, mix: %f\n",
+ t->ideal_frame_duration, t->vsync_interval, mix);
p->is_interpolated = true;
}
pass_draw_to_screen(p, fbo);
@@ -3803,8 +3795,8 @@ void gl_video_set_ambient_lux(struct gl_video *p, int lux)
{
if (p->opts.gamma_auto) {
p->opts.gamma = gl_video_scale_ambient_lux(16.0, 256.0, 1.0, 1.2, lux);
- MP_VERBOSE(p, "ambient light changed: %d lux (gamma: %f)\n", lux,
- p->opts.gamma);
+ MP_TRACE(p, "ambient light changed: %d lux (gamma: %f)\n", lux,
+ p->opts.gamma);
}
}
diff --git a/video/out/opengl/ra_gl.c b/video/out/opengl/ra_gl.c
index 60e667bf05..5b03368436 100644
--- a/video/out/opengl/ra_gl.c
+++ b/video/out/opengl/ra_gl.c
@@ -789,7 +789,7 @@ static GLuint load_program(struct ra *ra, const struct ra_renderpass_params *p,
GLint status = 0;
gl->GetProgramiv(prog, GL_LINK_STATUS, &status);
if (status) {
- MP_VERBOSE(ra, "Loading binary program succeeded.\n");
+ MP_DBG(ra, "Loading binary program succeeded.\n");
} else {
gl->DeleteProgram(prog);
prog = 0;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 22:45:22 +0000