Porting this code to be non-xorg-dependent is going to take significant hacking, so just dump it in the glamoregl module for the moment, so I can hack on it while regression testing.
v2: Fix compiler warnings by adding #include dix-config.h at the top, don't try to auto-init (I'll try to fix the xv ABI later). Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/Makefile.am | 1 - glamor/glamor.h | 5 ++++- glamor/glamor_eglmodule.c | 2 +- glamor/glamor_xv.c | 17 ++++++----------- hw/xfree86/glamor_egl/Makefile.am | 1 + 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/glamor/Makefile.am b/glamor/Makefile.am index 12a57c4..77492bc 100644 --- a/glamor/Makefile.am +++ b/glamor/Makefile.am @@ -37,7 +37,6 @@ libglamor_la_SOURCES = \ glamor_window.c\ glamor_fbo.c\ glamor_compositerects.c\ - glamor_xv.c\ glamor_utils.h\ glamor.h diff --git a/glamor/glamor.h b/glamor/glamor.h index 08ffd26..89e7d80 100644 --- a/glamor/glamor.h +++ b/glamor/glamor.h @@ -35,6 +35,9 @@ #include <picturestr.h> #include <fb.h> #include <fbpict.h> +#ifdef GLAMOR_FOR_XORG +#include <xf86xv.h> +#endif struct glamor_context; @@ -434,7 +437,7 @@ 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 +#ifdef GLAMOR_FOR_XORG extern _X_EXPORT XF86VideoAdaptorPtr glamor_xv_init(ScreenPtr pScreen, int num_texture_ports); #endif diff --git a/glamor/glamor_eglmodule.c b/glamor/glamor_eglmodule.c index fb5b855..d7e1836 100644 --- a/glamor/glamor_eglmodule.c +++ b/glamor/glamor_eglmodule.c @@ -41,7 +41,7 @@ static XF86ModuleVersionInfo VersRec = { MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - 0, 5, 1, /* version */ + 1, 0, 0, /* version */ ABI_CLASS_ANSIC, /* Only need the ansic layer */ ABI_ANSIC_VERSION, MOD_CLASS_NONE, diff --git a/glamor/glamor_xv.c b/glamor/glamor_xv.c index dc39476..a4ad031 100644 --- a/glamor/glamor_xv.c +++ b/glamor/glamor_xv.c @@ -32,10 +32,14 @@ * Xv acceleration implementation */ -#include "glamor_priv.h" +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif -#ifdef GLAMOR_XV #include "xf86xv.h" +#define GLAMOR_FOR_XORG +#include "glamor_priv.h" + #include <X11/extensions/Xv.h> #include "fourcc.h" /* Reference color space transform data */ @@ -614,12 +618,3 @@ 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 diff --git a/hw/xfree86/glamor_egl/Makefile.am b/hw/xfree86/glamor_egl/Makefile.am index 827e033..bb1b511 100644 --- a/hw/xfree86/glamor_egl/Makefile.am +++ b/hw/xfree86/glamor_egl/Makefile.am @@ -24,6 +24,7 @@ module_LTLIBRARIES = libglamoregl.la libglamoregl_la_SOURCES = \ $(top_srcdir)/glamor/glamor_egl.c \ $(top_srcdir)/glamor/glamor_eglmodule.c \ + $(top_srcdir)/glamor/glamor_xv.c \ $() libglamoregl_la_LDFLAGS = \ -- 1.9.rc1 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel