summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhenyu Wang <zhenyuw@linux.intel.com>2010-09-28 15:50:59 +0800
committerIan Romanick <ian.d.romanick@intel.com>2010-09-28 18:37:20 -0700
commit71bdc82c198432c00bc564bd796b8a4b549046df (patch)
treef12c2e40600652503c9ab59bce7cc4f09c6f7fba
parentaaf7f78dfa4229537bf546b31cb954b66f5d5b5d (diff)
i965: fallback bitmap operation on sandybridge
Need to bring back correct fb write with header to set pixel write mask. Fallback for now. Note: Conflicts in intel_pixel_bitmap.c due to the removal of intel_texture_bitmap from master. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
-rw-r--r--src/mesa/drivers/dri/intel/intel_pixel_bitmap.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
index 02c0ffce31d..c416d523890 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
@@ -508,10 +508,16 @@ intelBitmap(GLcontext * ctx,
const struct gl_pixelstore_attrib *unpack,
const GLubyte * pixels)
{
+ struct intel_context *intel = intel_context(ctx);
+
if (do_blit_bitmap(ctx, x, y, width, height,
unpack, pixels))
return;
+ /* FIXME */
+ if (intel->gen == 6)
+ return _swrast_Bitmap(ctx, x, y, width, height, unpack, pixels);
+
if (intel_texture_bitmap(ctx, x, y, width, height,
unpack, pixels))
return;