diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2014-03-31 17:59:18 -0700 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2014-04-01 10:31:09 -0700 |
| commit | fe204185bc801bb17785dc8d1cde09d48b5e257f (patch) | |
| tree | 7ae4505ac4ecadf4e794e24fbdab1ab42a17182e | |
| parent | 9ba2084321b1ac8d271feefee4f5b968d34226d6 (diff) | |
glamor: Move glamor_egl_screen_init() prototype to glamor.h
A DDX that implements the glamor EGL functions need to pull in this
prototype but shouldn't need to pull in glamor_priv.h
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | glamor/glamor.h | 2 | ||||
| -rw-r--r-- | glamor/glamor_egl_stubs.c | 4 | ||||
| -rw-r--r-- | glamor/glamor_priv.h | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/glamor/glamor.h b/glamor/glamor.h index 11ec49361..84b673610 100644 --- a/glamor/glamor.h +++ b/glamor/glamor.h @@ -310,6 +310,8 @@ extern _X_EXPORT Bool #endif +extern _X_EXPORT void glamor_egl_screen_init(ScreenPtr screen, + struct glamor_context *glamor_ctx); extern _X_EXPORT void glamor_egl_destroy_textured_pixmap(PixmapPtr pixmap); extern _X_EXPORT int glamor_create_gc(GCPtr gc); diff --git a/glamor/glamor_egl_stubs.c b/glamor/glamor_egl_stubs.c index 4fd9e8016..028d1cc05 100644 --- a/glamor/glamor_egl_stubs.c +++ b/glamor/glamor_egl_stubs.c @@ -26,7 +26,9 @@ * Stubbed out glamor_egl.c functions for servers other than Xorg. */ -#include "glamor_priv.h" +#include "dix-config.h" + +#include "glamor.h" void glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx) diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h index 4c305abfc..6aa2f748f 100644 --- a/glamor/glamor_priv.h +++ b/glamor/glamor_priv.h @@ -992,9 +992,6 @@ void glamor_composite_rectangles(CARD8 op, xRenderColor *color, int num_rects, xRectangle *rects); -extern _X_EXPORT void glamor_egl_screen_init(ScreenPtr screen, - struct glamor_context *glamor_ctx); - /* glamor_xv */ typedef struct { uint32_t transform_index; |