diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2008-10-10 15:26:28 +0100 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-10-10 15:26:28 +0100 |
| commit | 3a3801c1431203fc4dca24d56577995ae2e78956 (patch) | |
| tree | 7ec341b78ecc62dc1a238392aff828c363148d69 /src/mesa/drivers/dri/intel/intel_pixel.c | |
| parent | d7f1cb5b5a134b63227d5746a2dd1f05597c5c2f (diff) | |
| parent | 7216679c1998b49ff5b08e6b43f8d5779415bf54 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/glapi/descrip.mms
src/mesa/shader/grammar/descrip.mms
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_pixel.c')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_pixel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_pixel.c b/src/mesa/drivers/dri/intel/intel_pixel.c index f39fac13cf..b267ffd890 100644 --- a/src/mesa/drivers/dri/intel/intel_pixel.c +++ b/src/mesa/drivers/dri/intel/intel_pixel.c @@ -181,9 +181,9 @@ intelInitPixelFuncs(struct dd_function_table *functions) if (!getenv("INTEL_NO_BLIT")) { functions->Bitmap = intelBitmap; functions->CopyPixels = intelCopyPixels; + functions->DrawPixels = intelDrawPixels; #ifdef I915 functions->ReadPixels = intelReadPixels; - functions->DrawPixels = intelDrawPixels; #endif } } |