summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-09-01 12:23:01 -0600
committerBrian Paul <brianp@vmware.com>2009-09-01 17:39:30 -0600
commit15e6d08670eeaf843ae3d6e557d595da750a5e99 (patch)
treefe42e1dacb8400d72234a53271e07974651a3ce1
parentbe229d24c4902b42b22e4533ad58c92a4fb11b05 (diff)
intel: use _mesa_meta_copy_pixels() when do_blit_copypixels() fails
Also, trim down #includes.
-rw-r--r--src/mesa/drivers/dri/intel/intel_pixel_copy.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_pixel_copy.c b/src/mesa/drivers/dri/intel/intel_pixel_copy.c
index ca796b36559..07ca8f7ddb5 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel_copy.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_copy.c
@@ -26,18 +26,13 @@
**************************************************************************/
#include "main/glheader.h"
-#include "main/enums.h"
#include "main/image.h"
#include "main/state.h"
#include "main/mtypes.h"
-#include "main/macros.h"
#include "drivers/common/meta.h"
-#include "intel_screen.h"
#include "intel_context.h"
-#include "intel_batchbuffer.h"
#include "intel_buffers.h"
-#include "intel_blit.h"
#include "intel_regions.h"
#include "intel_pixel.h"
@@ -244,5 +239,6 @@ intelCopyPixels(GLcontext * ctx,
if (do_blit_copypixels(ctx, srcx, srcy, width, height, destx, desty, type))
return;
+ /* this will use swrast if needed */
_mesa_meta_copy_pixels(ctx, srcx, srcy, width, height, destx, desty, type);
}