Commit 961a8d71 authored by José María Casanova Crespo's avatar José María Casanova Crespo
Browse files

vc4: Avoid negative scissor caused by no intersection



This fixes 6 tests that were crashing on VC4 since
EGL_KHR_swap_buffers_with_damage was enabled.

dEQP-EGL.functional.swap_buffers_with_damage.*.buffer_age_render

Cc: 20.2 <mesa-stable>
Reviewed-by: Emma Anholt's avatarEric Anholt <eric@anholt.net>
Part-of: <!6976>
parent 9a899e57
Pipeline #209617 passed with stages
in 1 minute and 20 seconds
......@@ -50,13 +50,13 @@ vc4_emit_state(struct pipe_context *pctx)
if (!vc4->rasterizer->base.scissor) {
minx = MAX2(vp_minx, 0);
miny = MAX2(vp_miny, 0);
maxx = MIN2(vp_maxx, job->draw_width);
maxy = MIN2(vp_maxy, job->draw_height);
maxx = MAX2(MIN2(vp_maxx, job->draw_width), minx);
maxy = MAX2(MIN2(vp_maxy, job->draw_height), miny);
} else {
minx = MAX2(vp_minx, vc4->scissor.minx);
miny = MAX2(vp_miny, vc4->scissor.miny);
maxx = MIN2(vp_maxx, vc4->scissor.maxx);
maxy = MIN2(vp_maxy, vc4->scissor.maxy);
maxx = MAX2(MIN2(vp_maxx, vc4->scissor.maxx), minx);
maxy = MAX2(MIN2(vp_maxy, vc4->scissor.maxy), miny);
}
cl_emit(&job->bcl, CLIP_WINDOW, clip) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment