diff options
| author | Chia-I Wu <olv@lunarg.com> | 2010-03-10 09:48:33 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2010-03-10 09:50:19 +0800 |
| commit | 1f92cf55e1d19864a51e620a14c6912e94cd14ea (patch) | |
| tree | 0dbc6b0a62db20a841f310ab222615d171eba437 /src/gallium/state_trackers/egl/x11/native_x11.h | |
| parent | 02716cf7d16543d5dedc6e550895d77139ad2432 (diff) | |
st/egl: Fix build errors in ximage backend after merge.
This fixes assorted merge conflicts when master is merged to
gallium-sw-api-2 in 0c96690a5b6e1c2d114e7ec5f1e9d60a4ff2a330.
Diffstat (limited to 'src/gallium/state_trackers/egl/x11/native_x11.h')
| -rw-r--r-- | src/gallium/state_trackers/egl/x11/native_x11.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/egl/x11/native_x11.h b/src/gallium/state_trackers/egl/x11/native_x11.h index 21ed6a2e06..1566524926 100644 --- a/src/gallium/state_trackers/egl/x11/native_x11.h +++ b/src/gallium/state_trackers/egl/x11/native_x11.h @@ -29,7 +29,8 @@ #include "common/native.h" struct native_display * -x11_create_ximage_display(EGLNativeDisplayType dpy); +x11_create_ximage_display(EGLNativeDisplayType dpy, + struct native_event_handler *event_handler); struct native_display * x11_create_dri2_display(EGLNativeDisplayType dpy, |