Mesa (mesa_7_4_branch): intel: check if stencil test is enabled in intel_stencil_drawpixels()

[Brian Paul]

Module: Mesa
Branch: mesa_7_4_branch
Commit: 4d8f6617269f857ce0affe1da5d953b1d000e464
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4d8f6617269f857ce0affe1da5d953b1d000e464

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jan 28 17:00:23 2009 -0700

intel: check if stencil test is enabled in intel_stencil_drawpixels()

(cherry picked from master/commit 72ee0e247d799c85612c72bbd2257648e11fa583)

---

 src/mesa/drivers/dri/intel/intel_pixel_draw.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_pixel_draw.c b/src/mesa/drivers/dri/intel/intel_pixel_draw.c
index 0e83afa..bb36649 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel_draw.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_draw.c
@@ -92,7 +92,7 @@ intel_texture_drawpixels(GLcontext * ctx,
       return GL_FALSE;
    }
 
-   /* We don't have a way to generate fragments with stencil values which *
+   /* We don't have a way to generate fragments with stencil values which
     * will set the resulting stencil value.
     */
    if (format == GL_STENCIL_INDEX)
@@ -225,6 +225,10 @@ intel_stencil_drawpixels(GLcontext * ctx,
       return GL_FALSE;
    }
 
+   /* We don't support stencil testing/ops here */
+   if (ctx->Stencil.Enabled)
+      return GL_FALSE;
+
    /* We use FBOs for our wrapping of the depthbuffer into a color
     * destination.
     */