diff options
| author | Zhigang Gong <zhigang.gong@linux.intel.com> | 2012-07-16 11:25:09 +0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2013-12-18 11:23:53 -0800 |
| commit | bc1b412b3b0bb716702ec89ae512f2b5ec62c17a (patch) | |
| tree | 6a4b27b1f5341b0a799aa8e672a3bb49966f3813 /glamor/glamor.h | |
| parent | 4c27ca4700e4ba4ae19d77377a7776eb32f74647 (diff) | |
Synch with xorg 1.13 change.
As xorg 1.13 change the scrn interaces and remove those
global arrays. Some API change cause we can't build. Now
fix it.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Diffstat (limited to 'glamor/glamor.h')
| -rw-r--r-- | glamor/glamor.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/glamor/glamor.h b/glamor/glamor.h index fe3e4f849..bafd543b5 100644 --- a/glamor/glamor.h +++ b/glamor/glamor.h @@ -30,9 +30,8 @@ #define GLAMOR_H #include <scrnintstr.h> -#ifdef GLAMOR_FOR_XORG +#include <xf86.h> #include <xf86str.h> -#endif #include <pixmapstr.h> #include <gcstruct.h> #include <picturestr.h> @@ -117,7 +116,11 @@ extern _X_EXPORT void glamor_fini(ScreenPtr screen); * screen pixmap which must be a glamor pixmap and requires * the internal data structure still exist at that time. * Otherwise, the glamor internal structure will not be freed.*/ -extern _X_EXPORT Bool glamor_close_screen(int idx, ScreenPtr screen); +#ifndef XF86_SCRN_INTERFACE +extern _X_EXPORT Bool glamor_close_screen(int scrnIndex, ScreenPtr screen); +#else +extern _X_EXPORT Bool glamor_close_screen(ScreenPtr screen); +#endif /* Let glamor to know the screen's fbo. The low level |