From: Marek Olšák Date: Thu, 18 Oct 2018 21:54:24 +0000 (-0400) Subject: radeonsi: fix gnome-shell crash X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2a26b1c0451c9eca16febf76a0881737325fda69;p=mesa.git radeonsi: fix gnome-shell crash I wasn't expecting to get viewports with the center having negative coordinates. Broken by: 6cc79e4411f --- diff --git a/src/gallium/drivers/radeonsi/si_state_viewport.c b/src/gallium/drivers/radeonsi/si_state_viewport.c index b7fcd5bdb82..808eb366bde 100644 --- a/src/gallium/drivers/radeonsi/si_state_viewport.c +++ b/src/gallium/drivers/radeonsi/si_state_viewport.c @@ -184,8 +184,8 @@ static void si_emit_guardband(struct si_context *ctx) const unsigned hw_screen_offset_alignment = ctx->chip_class >= VI ? 16 : MAX2(ctx->screen->se_tile_repeat, 16); - hw_screen_offset_x = MIN2(hw_screen_offset_x, hw_screen_offset_max); - hw_screen_offset_y = MIN2(hw_screen_offset_y, hw_screen_offset_max); + hw_screen_offset_x = CLAMP(hw_screen_offset_x, 0, hw_screen_offset_max); + hw_screen_offset_y = CLAMP(hw_screen_offset_y, 0, hw_screen_offset_max); /* Align the screen offset by dropping the low 4 bits. */ hw_screen_offset_x &= ~(hw_screen_offset_alignment - 1);