fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-29 18:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

panvk/csf: Fix prepare_vp() when viewport->x is negative

Browse source 
The scissor descriptor wants positive min/max bounds.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Mary Guillemard <mary.guillemard@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31462>
This commit is contained in:
Boris Brezillon 2024-10-01 16:45:14 +02:00 • committed by Marge Bot
parent 2203376865
commit fbe8428af8
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c
View file

@ -545,7 +545,7 @@ prepare_vp(struct panvk_cmd_buffer *cmdbuf)
pan_pack(&scissor_box, SCISSOR, cfg) {
/* The spec says "width must be greater than 0.0" */
assert(viewport->x >= 0);
assert(viewport->width >= 0);
int minx = (int)viewport->x;
int maxx = (int)(viewport->x + viewport->width);
@ -565,10 +565,11 @@ prepare_vp(struct panvk_cmd_buffer *cmdbuf)
maxx = maxx > minx ? maxx - 1 : maxx;
maxy = maxy > miny ? maxy - 1 : maxy;
cfg.scissor_minimum_x = minx;
cfg.scissor_minimum_y = miny;
cfg.scissor_maximum_x = maxx;
cfg.scissor_maximum_y = maxy;
/* Clamp viewport scissor to valid range */
cfg.scissor_minimum_x = CLAMP(minx, 0, UINT16_MAX);
cfg.scissor_minimum_y = CLAMP(miny, 0, UINT16_MAX);
cfg.scissor_maximum_x = CLAMP(maxx, 0, UINT16_MAX);
cfg.scissor_maximum_y = CLAMP(maxy, 0, UINT16_MAX);
}
cs_move64_to(b, cs_sr_reg64(b, 42), scissor_box);