From d3ee8ba3469a6c143f5817e35a5200e9c836de32 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 8 Jan 2014 12:14:49 -0800 Subject: i965: Consider all viewports before enabling guardband clipping Signed-off-by: Ian Romanick Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/gen6_clip_state.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/mesa/drivers/dri/i965/gen6_clip_state.c b/src/mesa/drivers/dri/i965/gen6_clip_state.c index 3499e371ef9..ed7afd7d754 100644 --- a/src/mesa/drivers/dri/i965/gen6_clip_state.c +++ b/src/mesa/drivers/dri/i965/gen6_clip_state.c @@ -96,11 +96,15 @@ upload_clip_state(struct brw_context *brw) dw2 |= (ctx->Transform.ClipPlanesEnabled << GEN6_USER_CLIP_CLIP_DISTANCES_SHIFT); - if (ctx->ViewportArray[0].X == 0 && - ctx->ViewportArray[0].Y == 0 && - ctx->ViewportArray[0].Width == (float) fb->Width && - ctx->ViewportArray[0].Height == (float) fb->Height) { - dw2 |= GEN6_CLIP_GB_TEST; + dw2 |= GEN6_CLIP_GB_TEST; + for (unsigned i = 0; i < ctx->Const.MaxViewports; i++) { + if (ctx->ViewportArray[i].X != 0 || + ctx->ViewportArray[i].Y != 0 || + ctx->ViewportArray[i].Width != (float) fb->Width || + ctx->ViewportArray[i].Height != (float) fb->Height) { + dw2 &= ~GEN6_CLIP_GB_TEST; + break; + } } /* BRW_NEW_RASTERIZER_DISCARD */ -- cgit v1.2.3