From fe204185bc801bb17785dc8d1cde09d48b5e257f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Mon, 31 Mar 2014 17:59:18 -0700 Subject: [PATCH] glamor: Move glamor_egl_screen_init() prototype to glamor.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Keith Packard --- glamor/glamor.h | 2 ++ glamor/glamor_egl_stubs.c | 4 +++- 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;