From: Eric Anholt <eric@anholt.net>
Date: Tue, 24 Jun 2008 21:08:08 +0000 (-0700)
Subject: Merge commit 'origin/master' into drm-gem
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f6abe8f0f2fba3073b58b96ed38aae163c765b4a;p=mesa.git

Merge commit 'origin/master' into drm-gem
---

f6abe8f0f2fba3073b58b96ed38aae163c765b4a
diff --cc src/mesa/drivers/dri/i915/Makefile
index ccba34d2293,bdd3b852603..fd77980ebf8
--- a/src/mesa/drivers/dri/i915/Makefile
+++ b/src/mesa/drivers/dri/i915/Makefile
@@@ -27,7 -27,11 +27,11 @@@ DRIVER_SOURCES = 
  	intel_tex_validate.c \
  	intel_tex_format.c \
  	intel_tex.c \
+ 	intel_pixel.c \
+ 	intel_pixel_bitmap.c \
  	intel_pixel_copy.c \
 -	intel_pixel_read.c \
+ 	intel_pixel_draw.c \
++	intel_pixel_read.c \
  	intel_buffers.c \
  	intel_blit.c \
  	i915_tex.c \