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

Author: Brian Paul <[email protected]>
Date:   Thu Sep 10 15:34:34 2009 -0600

intel: disable intel_stencil_drawpixels() for now

It doesn't work reliably even when all the prerequisite checks are made.

---

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

diff --git a/src/mesa/drivers/dri/intel/intel_pixel_draw.c 
b/src/mesa/drivers/dri/intel/intel_pixel_draw.c
index 8c11388..7fbb89f 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel_draw.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_draw.c
@@ -42,6 +42,7 @@
 #include "main/depth.h"
 #include "main/hash.h"
 #include "main/blend.h"
+#include "swrast/swrast.h"
 #include "drivers/common/meta.h"
 
 #include "intel_context.h"
@@ -260,9 +261,24 @@ intelDrawPixels(GLcontext * ctx,
                 const struct gl_pixelstore_attrib *unpack,
                 const GLvoid * pixels)
 {
+#if 0
+   /* XXX this function doesn't seem to work reliably even when all
+    * the pre-requisite conditions are met.
+    * Note that this function is never hit with conform.
+    * Fall back to swrast because even the _mesa_meta_draw_pixels() approach
+    * isn't working because of an apparent stencil bug.
+    */
    if (intel_stencil_drawpixels(ctx, x, y, width, height, format, type,
                                unpack, pixels))
       return;
+#else
+   (void) intel_stencil_drawpixels; /* silence warning */
+   if (format == GL_STENCIL_INDEX) {
+      _swrast_DrawPixels(ctx, x, y, width, height, format, type,
+                         unpack, pixels);
+      return;
+   }
+#endif
 
    _mesa_meta_draw_pixels(ctx, x, y, width, height, format, type,
                           unpack, pixels);

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to