diff options
author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-12-03 14:17:26 -0800 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-12-03 14:17:26 -0800 |
commit | 53addc5d6ef7406d9fab5ea481cf68fa011870f1 (patch) | |
tree | eb43991923600b5751e04539438e5fffebb61cb3 /xf86drm.h | |
parent | db50f5127421ac8f4e3ce4eb7c27d27475781488 (diff) | |
parent | ee746a83cecd99d4c380fbc5d391399a6d9fde9e (diff) |
Merge branch 'pageflip' of git://people.freedesktop.org/~jbarnes/drm
Conflicts:
include/drm/drm.h - RMFB had its signature changed to avoid uint32_t
Diffstat (limited to 'xf86drm.h')
-rw-r--r-- | xf86drm.h | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -707,6 +707,12 @@ typedef struct _drmEventContext { unsigned int tv_usec, void *user_data); + void (*page_flip_handler)(int fd, + unsigned int sequence, + unsigned int tv_sec, + unsigned int tv_usec, + void *user_data); + } drmEventContext, *drmEventContextPtr; extern int drmHandleEvent(int fd, drmEventContextPtr evctx); |