From 2e775b8bdbc5cd0d120b5c757188f6e85bf0d59d 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: --- src/intel/vulkan/genX_cmd_buffer.c | 7 +++++-- src/intel/vulkan_hasvk/genX_cmd_buffer.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 38651d34fdb..5b0132afa1c 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -3509,11 +3509,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 1c2d4958537..d5aa46749b5 100644 --- a/src/intel/vulkan_hasvk/genX_cmd_buffer.c +++ b/src/intel/vulkan_hasvk/genX_cmd_buffer.c @@ -3094,11 +3094,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);