frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kristian Høgsberg 2014-03-31 17:59:18 -07:00
parent 9ba2084321
commit fe204185bc
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glamor/glamor.h
View File

@ -310,6 +310,8 @@ extern _X_EXPORT Bool
#endif #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 void glamor_egl_destroy_textured_pixmap(PixmapPtr pixmap);
extern _X_EXPORT int glamor_create_gc(GCPtr gc); extern _X_EXPORT int glamor_create_gc(GCPtr gc);

4
glamor/glamor_egl_stubs.c
View File

@ -26,7 +26,9 @@
* Stubbed out glamor_egl.c functions for servers other than Xorg. * Stubbed out glamor_egl.c functions for servers other than Xorg.
*/ */
#include "glamor_priv.h" #include "dix-config.h"
#include "glamor.h"
void void
glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx) glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx)

3
glamor/glamor_priv.h
View File

@ -992,9 +992,6 @@ void glamor_composite_rectangles(CARD8 op,
xRenderColor *color, xRenderColor *color,
int num_rects, xRectangle *rects); int num_rects, xRectangle *rects);
extern _X_EXPORT void glamor_egl_screen_init(ScreenPtr screen,
struct glamor_context *glamor_ctx);
/* glamor_xv */ /* glamor_xv */
typedef struct { typedef struct {
uint32_t transform_index; uint32_t transform_index;