diff options
| author | Gwenole Beauchesne <gbeauchesne@splitted-desktop.com> | 2009-07-08 07:54:44 +0000 |
|---|---|---|
| committer | Austin Yuan <shengquan.yuan@intel.com> | 2009-08-28 11:00:00 +0800 |
| commit | e2a24f0189561cc4feaf00d0b48f22947704ae56 (patch) | |
| tree | 0e398b0c611b7dfc19bd0fe7bd3a47099e3f6dfd /src | |
| parent | 4e71a2ddfd56543c60e91525726d136a526d1162 (diff) | |
| download | libva-e2a24f0189561cc4feaf00d0b48f22947704ae56.tar.gz | |
Split libva DSO into core (libva.so) and display-dependent parts (libva-x11.so).
Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 12 | ||||
| -rw-r--r-- | src/va.c | 6 | ||||
| -rw-r--r-- | src/x11/va_x11.c | 21 |
3 files changed, 15 insertions, 24 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 5fac8b5..3849e8f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,10 +28,18 @@ INCLUDES = \ LDADD = \ $(LIBVA_LT_LDFLAGS) -libva_la_LTLIBRARIES = libva.la +lib_LTLIBRARIES = \ + libva.la \ + libva-x11.la + libva_ladir = $(libdir) libva_la_LDFLAGS = $(LDADD) -no-undefined -libva_la_LIBADD = $(LIBVA_LIBS) -ldl -lX11 -lXext x11/libva_x11.la -ldrm -lXfixes +libva_la_LIBADD = $(LIBVA_LIBS) -ldl + +libva_x11_la_SOURCES = +libva_x11_la_LIBADD = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS) +libva_x11_la_LDFLAGS = $(LDADD) +libva_x11_la_DEPENDENCIES = $(libvacorelib) SUBDIRS = x11 @@ -56,7 +56,11 @@ static int va_debug_trace = 0; -int vaDisplayIsValid(VADisplay dpy); +static int vaDisplayIsValid(VADisplay dpy) +{ + VADisplayContextP pDisplayContext = (VADisplayContextP)dpy; + return pDisplayContext && pDisplayContext->vaIsValid(pDisplayContext); +} static void va_errorMessage(const char *msg, ...) { diff --git a/src/x11/va_x11.c b/src/x11/va_x11.c index ec0bbc8..9de904e 100644 --- a/src/x11/va_x11.c +++ b/src/x11/va_x11.c @@ -205,27 +205,6 @@ static VAStatus va_DisplayContextGetDriverName ( return vaStatus; } -int vaDisplayIsValid(VADisplay dpy) -{ - VADisplayContextP tmp=NULL; - VADisplayContextP pDisplayContext = pDisplayContexts; - - while (pDisplayContext) - { - if (pDisplayContext == (VADisplayContextP)dpy) - { - tmp = (VADisplay)pDisplayContext; - break; - } - pDisplayContext = pDisplayContext->pNext; - } - - if (!tmp) - return 0; - - return tmp->vaIsValid(pDisplayContext); -} - VADisplay vaGetDisplay ( Display *native_dpy /* implementation specific */ |