diff options
| author | Adam Jackson <ajax@redhat.com> | 2013-07-15 15:18:00 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2013-07-15 15:18:00 -0400 |
| commit | 54cff7c9914a9006201a5831c4f2229437158bcd (patch) | |
| tree | da882f4c8b003bd2924579dd44cf7db9be8f8505 | |
| parent | 81aadb8ae204f58d77a948c8624f1e72659dcdf0 (diff) | |
Clean xf86 headers out from glamor.h
Makes glamor.h includeable in dix code.
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | src/glamor.h | 8 | ||||
| -rw-r--r-- | src/glamor_egl.c | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/glamor.h b/src/glamor.h index bafd543..a1579a7 100644 --- a/src/glamor.h +++ b/src/glamor.h @@ -29,9 +29,11 @@ #ifndef GLAMOR_H #define GLAMOR_H +#ifndef XF86_SCRN_INTERFACE +#define XF86_SCRN_INTERFACE +#endif + #include <scrnintstr.h> -#include <xf86.h> -#include <xf86str.h> #include <pixmapstr.h> #include <gcstruct.h> #include <picturestr.h> @@ -178,7 +180,7 @@ extern _X_EXPORT void glamor_pixmap_exchange_fbos(PixmapPtr front, PixmapPtr bac * Should be called from DDX's preInit function. * Return TRUE if success, otherwise return FALSE. * */ -extern _X_EXPORT Bool glamor_egl_init(ScrnInfoPtr scrn, int fd); +extern _X_EXPORT Bool glamor_egl_init(void *scrn, int fd); /* @glamor_egl_init_textured_pixmap: Initialization for textured pixmap allocation. * diff --git a/src/glamor_egl.c b/src/glamor_egl.c index cd0bdc0..35c1219 100644 --- a/src/glamor_egl.c +++ b/src/glamor_egl.c @@ -453,8 +453,9 @@ glamor_egl_free_screen(FREE_SCREEN_ARGS_DECL) } Bool -glamor_egl_init(ScrnInfoPtr scrn, int fd) +glamor_egl_init(void *_scrn, int fd) { + ScrnInfoPtr scrn = _scrn; struct glamor_egl_screen_private *glamor_egl; const char *version; EGLint config_attribs[] = { |