From: Kenneth Graunke <kenneth@whitecape.org>
Date: Mon, 5 Mar 2012 21:54:29 +0000 (-0800)
Subject: intel: Remove pointless software fallback for glBitmap on Gen6.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3cd7bee48f7caf7850ea64d40f43875d4c975507;p=mesa.git

intel: Remove pointless software fallback for glBitmap on Gen6.

We already have a meta path below that works just fine; no apparent
regressions in oglconform.

NOTE: This is a candidate for the 8.0 branch.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=46834
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
---

diff --git a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
index bdfb9abd27d..6821b69f0fc 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
@@ -337,9 +337,5 @@ intelBitmap(struct gl_context * ctx,
                           unpack, pixels))
       return;
 
-   /* FIXME */
-   if (intel->gen == 6)
-       return _swrast_Bitmap(ctx, x, y, width, height, unpack, pixels);
-
    _mesa_meta_Bitmap(ctx, x, y, width, height, unpack, pixels);
 }