Mesa (master): mesa: avoid redundant viewport changes in meta code
Brian Paul
brianp at kemper.freedesktop.org
Sun Aug 30 15:16:26 UTC 2009
Module: Mesa
Branch: master
Commit: 0243f79eac707cb2209346b0be2f7b67ce6efdf8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0243f79eac707cb2209346b0be2f7b67ce6efdf8
Author: Brian Paul <brianp at vmware.com>
Date: Thu Aug 27 14:47:24 2009 -0600
mesa: avoid redundant viewport changes in meta code
---
src/mesa/drivers/common/meta.c | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index e42beab..f086112 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -432,13 +432,23 @@ _mesa_meta_begin(GLcontext *ctx, GLbitfield state)
}
if (state & META_VIEWPORT) {
+ /* save viewport state */
save->ViewportX = ctx->Viewport.X;
save->ViewportY = ctx->Viewport.Y;
save->ViewportW = ctx->Viewport.Width;
save->ViewportH = ctx->Viewport.Height;
- _mesa_Viewport(0, 0, ctx->DrawBuffer->Width, ctx->DrawBuffer->Height);
+ /* set viewport to match window size */
+ if (ctx->Viewport.X != 0 ||
+ ctx->Viewport.Y != 0 ||
+ ctx->Viewport.Width != ctx->DrawBuffer->Width ||
+ ctx->Viewport.Height != ctx->DrawBuffer->Height) {
+ _mesa_set_viewport(ctx, 0, 0,
+ ctx->DrawBuffer->Width, ctx->DrawBuffer->Height);
+ }
+ /* save depth range state */
save->DepthNear = ctx->Viewport.Near;
save->DepthFar = ctx->Viewport.Far;
+ /* set depth range to default */
_mesa_DepthRange(0.0, 1.0);
}
@@ -642,8 +652,13 @@ _mesa_meta_end(GLcontext *ctx)
}
if (state & META_VIEWPORT) {
- _mesa_Viewport(save->ViewportX, save->ViewportY,
- save->ViewportW, save->ViewportH);
+ if (save->ViewportX != ctx->Viewport.X ||
+ save->ViewportY != ctx->Viewport.Y ||
+ save->ViewportW != ctx->Viewport.Width ||
+ save->ViewportH != ctx->Viewport.Height) {
+ _mesa_set_viewport(ctx, save->ViewportX, save->ViewportY,
+ save->ViewportW, save->ViewportH);
+ }
_mesa_DepthRange(save->DepthNear, save->DepthFar);
}
More information about the mesa-commit
mailing list