From d4d1f522842760db571d8edd72bca21990a46638 Mon Sep 17 00:00:00 2001 From: Otavio Pontes Date: Wed, 19 Oct 2022 14:39:24 -0700 Subject: [PATCH] anv/hasvk: Clamping Scissor Rect values in a valid range On cmd_buffer_emit_scissor(), if VkViewport height or width are set to a value lower than 1.0, y_max or x_max can be attributed negative values, causing an overflow. That leads to ScissorRectangleYMax or ScissorRectangleXMax to be set to values on an unsupported range. Clamping x_max and y_max in the valid range solves the problem. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7471 Reviewed-by: Lionel Landwerlin Cc: mesa-stable Part-of: (cherry picked from commit 2e775b8bdbc5cd0d120b5c757188f6e85bf0d59d) --- .pick_status.json | 2 +- src/intel/vulkan/genX_cmd_buffer.c | 7 +++++-- src/intel/vulkan_hasvk/genX_cmd_buffer.c | 7 +++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 5df0db86c88..95bc926729a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3010,7 +3010,7 @@ "description": "anv/hasvk: Clamping Scissor Rect values in a valid range", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index ddf73d55f42..d56f9037fde 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -3494,11 +3494,14 @@ cmd_buffer_emit_scissor(struct anv_cmd_buffer *cmd_buffer) uint32_t y_min = MAX2(s->offset.y, MIN2(vp->y, vp->y + vp->height)); uint32_t x_min = MAX2(s->offset.x, vp->x); - uint32_t y_max = MIN2(s->offset.y + s->extent.height - 1, + int64_t y_max = MIN2(s->offset.y + s->extent.height - 1, MAX2(vp->y, vp->y + vp->height) - 1); - uint32_t x_max = MIN2(s->offset.x + s->extent.width - 1, + int64_t x_max = MIN2(s->offset.x + s->extent.width - 1, vp->x + vp->width - 1); + y_max = clamp_int64(y_max, 0, INT16_MAX >> 1); + x_max = clamp_int64(x_max, 0, INT16_MAX >> 1); + /* Do this math using int64_t so overflow gets clamped correctly. */ if (cmd_buffer->vk.level == VK_COMMAND_BUFFER_LEVEL_PRIMARY) { y_min = clamp_int64((uint64_t) y_min, gfx->render_area.offset.y, max); diff --git a/src/intel/vulkan_hasvk/genX_cmd_buffer.c b/src/intel/vulkan_hasvk/genX_cmd_buffer.c index 841790480ba..4f681e6217f 100644 --- a/src/intel/vulkan_hasvk/genX_cmd_buffer.c +++ b/src/intel/vulkan_hasvk/genX_cmd_buffer.c @@ -3647,11 +3647,14 @@ cmd_buffer_emit_scissor(struct anv_cmd_buffer *cmd_buffer) uint32_t y_min = MAX2(s->offset.y, MIN2(vp->y, vp->y + vp->height)); uint32_t x_min = MAX2(s->offset.x, vp->x); - uint32_t y_max = MIN2(s->offset.y + s->extent.height - 1, + int64_t y_max = MIN2(s->offset.y + s->extent.height - 1, MAX2(vp->y, vp->y + vp->height) - 1); - uint32_t x_max = MIN2(s->offset.x + s->extent.width - 1, + int64_t x_max = MIN2(s->offset.x + s->extent.width - 1, vp->x + vp->width - 1); + y_max = clamp_int64(y_max, 0, INT16_MAX >> 1); + x_max = clamp_int64(x_max, 0, INT16_MAX >> 1); + /* Do this math using int64_t so overflow gets clamped correctly. */ if (cmd_buffer->vk.level == VK_COMMAND_BUFFER_LEVEL_PRIMARY) { y_min = clamp_int64((uint64_t) y_min, gfx->render_area.offset.y, max);