Mesa (master): Revert "meta: Don't try to glOrtho when the draw buffer isn' t initialized."

Kenneth Graunke kwg at kemper.freedesktop.org
Thu Nov 29 21:51:16 UTC 2012


Module: Mesa
Branch: master
Commit: 53ba40c1567125e9462289be01f5c137701f4f5d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=53ba40c1567125e9462289be01f5c137701f4f5d

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Thu Nov 29 13:47:13 2012 -0800

Revert "meta: Don't try to glOrtho when the draw buffer isn't initialized."

This reverts commit 9947470655bbf8f4a9c98fe6d93ff5c3486f1124.
Apparently it caused a lot of Piglit regressions.

---

 src/mesa/drivers/common/meta.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index e4ff5c9..08bd899 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -684,11 +684,9 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
       _mesa_LoadIdentity();
       _mesa_MatrixMode(GL_PROJECTION);
       _mesa_LoadIdentity();
-      if (ctx->DrawBuffer->Initialized) {
-         _mesa_Ortho(0.0, ctx->DrawBuffer->Width,
-                     0.0, ctx->DrawBuffer->Height,
-                     -1.0, 1.0);
-      }
+      _mesa_Ortho(0.0, ctx->DrawBuffer->Width,
+                  0.0, ctx->DrawBuffer->Height,
+                  -1.0, 1.0);
    }
 
    if (state & MESA_META_CLIP) {




More information about the mesa-commit mailing list