From 6725b9419525509064cb3e15f96a648a695a037d Mon Sep 17 00:00:00 2001
From: Niklas Haas <git@haasn.xyz>
Date: Mon, 25 May 2020 12:05:29 +0200
Subject: [PATCH] Revert "renderer: assert if SAMPLER_NOOP implies scaling"
This reverts commit 58e588cde55d44d72f59f717cc43659a7b8a36e6.
Required by the previous revert.
---
src/renderer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/renderer.c b/src/renderer.c
index aa3f01ebc..e64f7fa2c 100644
--- a/src/renderer.c
+++ b/src/renderer.c
@@ -1310,6 +1310,7 @@ static bool pass_scale_main(struct pl_renderer *rr, struct pass_state *pass,
const struct pl_image *image = &pass->image;
bool need_fbo = image->num_overlays > 0;
need_fbo |= rr->peak_detect_state && !params->allow_delayed_peak_detect;
+ need_fbo |= src.new_w != img->w || src.new_h != img->h;
struct sampler_info info = sample_src_info(rr, &src, params);
bool use_sigmoid = info.dir == SAMPLER_UP && params->sigmoid_params;
@@ -1332,7 +1333,6 @@ static bool pass_scale_main(struct pl_renderer *rr, struct pass_state *pass,
}
if (info.dir == SAMPLER_NOOP && !need_fbo) {
- pl_assert(src.new_w == img->w && src.new_h == img->h);
PL_TRACE(rr, "Skipping main scaler (would be no-op)");
return true;
}
--
GitLab