Skip to content
Snippets Groups Projects
Commit 58e588cd authored by Niklas Haas's avatar Niklas Haas
Browse files

renderer: assert if SAMPLER_NOOP implies scaling

With ca1ebc, the mismatched shaders of the variety that 092229 was
intending to solve should no longer be a possibility.

If this is still the case, it's probably a bug. Assert instead.
parent bde7fc04
No related branches found
No related tags found
No related merge requests found
Pipeline #17666 passed with stages
in 5 minutes and 27 seconds
...@@ -1312,7 +1312,6 @@ static bool pass_scale_main(struct pl_renderer *rr, struct pass_state *pass, ...@@ -1312,7 +1312,6 @@ static bool pass_scale_main(struct pl_renderer *rr, struct pass_state *pass,
bool need_fbo = image->num_overlays > 0; bool need_fbo = image->num_overlays > 0;
need_fbo |= rr->peak_detect_state && !params->allow_delayed_peak_detect; 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); struct sampler_info info = sample_src_info(rr, &src, params);
bool use_sigmoid = info.dir == SAMPLER_UP && params->sigmoid_params; bool use_sigmoid = info.dir == SAMPLER_UP && params->sigmoid_params;
...@@ -1335,6 +1334,7 @@ static bool pass_scale_main(struct pl_renderer *rr, struct pass_state *pass, ...@@ -1335,6 +1334,7 @@ static bool pass_scale_main(struct pl_renderer *rr, struct pass_state *pass,
} }
if (info.dir == SAMPLER_NOOP && !need_fbo) { 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)"); PL_TRACE(rr, "Skipping main scaler (would be no-op)");
return true; return true;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment