Mesa (8.0): meta: fix glDrawPixels fallback test, stencil drawing

[Ian Romanick]

Module: Mesa
Branch: 8.0
Commit: 28994d8b97c4596b5ec55dc194f55f62889f43b1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=28994d8b97c4596b5ec55dc194f55f62889f43b1

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Jul 27 08:22:44 2012 -0600

meta: fix glDrawPixels fallback test, stencil drawing

Remove the check for pixel transfer ops.  If any RGB/depth scale/bias
is in effect, it'll be applied in the glTexImage step.

If drawing stencil pixels we need to disable pixel transfer so that
alpha scale/bias are not applied to the stencil data.

These issues were spotted by Roland.

Fixes Blender performance issues reported in
http://bugs.freedesktop.org/show_bug.cgi?id=47375

NOTE: This is a candidate for the 8.0 branch.

Tested-by: Barto <mister.freeman at laposte.net>
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
(cherry picked from commit 906febaf8bd37fffa4fc14c56eda1dd6e4b4dcda)

---

 src/mesa/drivers/common/meta.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 82bbbf3..8540d07 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -2253,8 +2253,7 @@ _mesa_meta_DrawPixels(struct gl_context *ctx,
     * Determine if we can do the glDrawPixels with texture mapping.
     */
    fallback = GL_FALSE;
-   if (ctx->_ImageTransferState ||
-       ctx->Fog.Enabled) {
+   if (ctx->Fog.Enabled) {
       fallback = GL_TRUE;
    }
 
@@ -2289,6 +2288,7 @@ _mesa_meta_DrawPixels(struct gl_context *ctx,
          texIntFormat = GL_ALPHA;
          metaExtraSave = (MESA_META_COLOR_MASK |
                           MESA_META_DEPTH_TEST |
+                          MESA_META_PIXEL_TRANSFER |
                           MESA_META_SHADER |
                           MESA_META_STENCIL_TEST);
       }