From cbb271a48845c2d236f31327df316d42888a1907 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Wed, 13 Nov 2013 16:24:56 -0700 Subject: mesa: Convert gl_context::Viewport to gl_context::ViewportArray Only element 0 of the array is used anywhere at this time, so there should be no changes. v4: Split out from a single megapatch. Suggested by Ken. Signed-off-by: Courtney Goeltzenleuchter Signed-off-by: Ian Romanick Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i915/i915_state.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/mesa/drivers/dri/i915') diff --git a/src/mesa/drivers/dri/i915/i915_state.c b/src/mesa/drivers/dri/i915/i915_state.c index 94be2379854..f31b271500f 100644 --- a/src/mesa/drivers/dri/i915/i915_state.c +++ b/src/mesa/drivers/dri/i915/i915_state.c @@ -404,21 +404,21 @@ intelCalcViewport(struct gl_context * ctx) if (_mesa_is_winsys_fbo(ctx->DrawBuffer)) { _math_matrix_viewport(&intel->ViewportMatrix, - ctx->Viewport.X, - ctx->DrawBuffer->Height - ctx->Viewport.Y, - ctx->Viewport.Width, - -ctx->Viewport.Height, - ctx->Viewport.Near, - ctx->Viewport.Far, + ctx->ViewportArray[0].X, + ctx->DrawBuffer->Height - ctx->ViewportArray[0].Y, + ctx->ViewportArray[0].Width, + -ctx->ViewportArray[0].Height, + ctx->ViewportArray[0].Near, + ctx->ViewportArray[0].Far, 1.0); } else { _math_matrix_viewport(&intel->ViewportMatrix, - ctx->Viewport.X, - ctx->Viewport.Y, - ctx->Viewport.Width, - ctx->Viewport.Height, - ctx->Viewport.Near, - ctx->Viewport.Far, + ctx->ViewportArray[0].X, + ctx->ViewportArray[0].Y, + ctx->ViewportArray[0].Width, + ctx->ViewportArray[0].Height, + ctx->ViewportArray[0].Near, + ctx->ViewportArray[0].Far, 1.0); } } -- cgit v1.2.3