fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 17:58:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

vc4: Avoid negative scissor caused by no intersection

Browse source 
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: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6976>
(cherry picked from commit 961a8d71cd)
This commit is contained in:
Jose Maria Casanova Crespo 2020-10-02 00:55:07 +01:00 • committed by Dylan Baker
parent f3f44dbf63
commit 2e62030423
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -175,7 +175,7 @@
"description": "vc4: Avoid negative scissor caused by no intersection",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": null
},

8
src/gallium/drivers/vc4/vc4_emit.c
View file

@ -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) {