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_egl.c | |
| 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_egl.c')
| -rw-r--r-- | glamor/glamor_egl.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index 07acf1a37..da9283b11 100644 --- a/glamor/glamor_egl.c +++ b/glamor/glamor_egl.c @@ -59,6 +59,7 @@ #include <EGL/eglext.h> #include "glamor.h" +#include "compat-api.h" #include "glamor_gl_dispatch.h" #ifdef GLX_USE_SHARED_DISPATCH #include "glapi.h" @@ -365,7 +366,7 @@ glamor_egl_destroy_textured_pixmap(PixmapPtr pixmap) } static Bool -glamor_egl_close_screen(int idx, ScreenPtr screen) +glamor_egl_close_screen(CLOSE_SCREEN_ARGS_DECL) { ScrnInfoPtr scrn; struct glamor_egl_screen_private *glamor_egl; @@ -391,7 +392,7 @@ glamor_egl_close_screen(int idx, ScreenPtr screen) screen->CloseScreen = glamor_egl->saved_close_screen; - return screen->CloseScreen(idx, screen); + return screen->CloseScreen(CLOSE_SCREEN_ARGS); } static Bool @@ -430,10 +431,15 @@ glamor_egl_screen_init(ScreenPtr screen) } static void -glamor_egl_free_screen(int scrnIndex, int flags) +glamor_egl_free_screen(FREE_SCREEN_ARGS_DECL) { - ScrnInfoPtr scrn = xf86Screens[scrnIndex]; + ScrnInfoPtr scrn; struct glamor_egl_screen_private *glamor_egl; +#ifndef XF86_SCRN_INTERFACE + scrn = xf86Screens[arg]; +#else + scrn = arg; +#endif glamor_egl = glamor_egl_get_screen_private(scrn); if (glamor_egl != NULL) { @@ -447,7 +453,7 @@ glamor_egl_free_screen(int scrnIndex, int flags) #endif scrn->FreeScreen = glamor_egl->saved_free_screen; free(glamor_egl); - scrn->FreeScreen(scrnIndex, flags); + scrn->FreeScreen(FREE_SCREEN_ARGS); } } |