From c5e72eb09daba7a087006f6ade691798f759a23c Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 1 Mar 2021 14:52:25 -0500 Subject: [PATCH] mesa/st: clamp scissored clear regions to fb size these should never be larger than the fb and drivers shouldn't have to care about it Fixes: 1c8bcad81a7 ("gallium: add pipe cap for scissored clears and pass scissor state to clear() hook") Reviewed-by: Dave Airlie Part-of: --- src/mesa/state_tracker/st_cb_clear.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mesa/state_tracker/st_cb_clear.c b/src/mesa/state_tracker/st_cb_clear.c index f714c89e3db..28ce51a936f 100644 --- a/src/mesa/state_tracker/st_cb_clear.c +++ b/src/mesa/state_tracker/st_cb_clear.c @@ -538,6 +538,11 @@ st_Clear(struct gl_context *ctx, GLbitfield mask) scissor_state.miny = MAX2(miny, 0); scissor_state.maxy = MAX2(maxy, 0); } + if (have_scissor_buffers) { + const struct gl_framebuffer *fb = ctx->DrawBuffer; + scissor_state.maxx = MIN2(scissor_state.maxx, fb->Width); + scissor_state.maxy = MIN2(scissor_state.maxy, fb->Height); + } /* We can't translate the clear color to the colorbuffer format, * because different colorbuffers may have different formats. */