diff options
| author | Eric Anholt <eric@anholt.net> | 2007-05-24 13:59:50 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-05-24 16:46:54 -0700 |
| commit | fd9d27e0686f5a15803d13d207e58be1972fdf31 (patch) | |
| tree | 79f8847e0fd723567032fa201d7b3ff2fdf5621d /include/GL/xmesa_x.h | |
| parent | b1fcabefa2f3fa81a20c1556383458315bb49bbf (diff) | |
| parent | f116aed1ede0d802e9f3c5989290002975c00330 (diff) | |
Merge branch 'master' into i915-unification
Conflicts:
src/mesa/drivers/dri/i915tex/i830_texstate.c
src/mesa/drivers/dri/i915tex/i915_texstate.c
Diffstat (limited to 'include/GL/xmesa_x.h')
| -rw-r--r-- | include/GL/xmesa_x.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/GL/xmesa_x.h b/include/GL/xmesa_x.h index 721d8b5107..865bab4313 100644 --- a/include/GL/xmesa_x.h +++ b/include/GL/xmesa_x.h @@ -66,6 +66,7 @@ typedef XColor XMesaColor; #define XMesaDrawPoints XDrawPoints #define XMesaDrawLine XDrawLine #define XMesaFillRectangle XFillRectangle +#define XMesaGetImage XGetImage #define XMesaPutImage XPutImage #define XMesaCopyArea XCopyArea |