From 7759e4d090f56cdcad1c8a2acb2c1be20021de5d Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 18 Dec 2013 11:43:48 -0800 Subject: [PATCH] glamor: Disable the XV code for now. We're going to want to make this DIX code instead of XF86 if at all possible, but for now just disable it so we can work on the rest of the build. Signed-off-by: Eric Anholt Reviewed-by: Zhigang Gong Reviewed-by: Keith Packard --- glamor/glamor.h | 2 ++ glamor/glamor_xv.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/glamor/glamor.h b/glamor/glamor.h index da1ad3daa..7dc297311 100644 --- a/glamor/glamor.h +++ b/glamor/glamor.h @@ -437,7 +437,9 @@ extern _X_EXPORT Bool glamor_poly_line_nf(DrawablePtr pDrawable, GCPtr pGC, extern _X_EXPORT Bool glamor_poly_lines_nf(DrawablePtr drawable, GCPtr gc, int mode, int n, DDXPointPtr points); +#if 0 extern _X_EXPORT XF86VideoAdaptorPtr glamor_xv_init(ScreenPtr pScreen, int num_texture_ports); +#endif #endif /* GLAMOR_H */ diff --git a/glamor/glamor_xv.c b/glamor/glamor_xv.c index bdc4c73b7..6e91a0c00 100644 --- a/glamor/glamor_xv.c +++ b/glamor/glamor_xv.c @@ -627,9 +627,11 @@ glamor_xv_init(ScreenPtr screen, int num_texture_ports) return adapt; } #else +#if 0 XF86VideoAdaptorPtr glamor_xv_init(ScreenPtr screen, int num_texture_ports) { return NULL; } #endif +#endif