summaryrefslogtreecommitdiff
path: root/va/x11
diff options
context:
space:
mode:
authorGwenole Beauchesne <gwenole.beauchesne@intel.com>2012-09-26 10:48:35 +0200
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>2012-09-26 11:17:11 +0200
commit2afd3966a516b37ed451777feeb8e313e1b9dc33 (patch)
tree9b0dc74836485bdfd493e00633be555bf726698e /va/x11
parent44b03ffcdb814392a9acf025615f99a06fed63d4 (diff)
downloadlibva-2afd3966a516b37ed451777feeb8e313e1b9dc33.tar.gz
Revert Pixmap-based EGL interfaces.
This was work-in-progress and it turned out to be less efficient than a dedicated API that could allow direct texturing from YUV components. This reverts the following commits: 30b5e62: fix license template for Makefile.am d1acbc9: add the missing license header to some files fc8f1b8: include va_egl.h instead of va.h c3ab994: array bound check 7b663dc: update the VA/EGL implementation in VAAPI 0851426: move va_egl.h to va/ to avoid compile error 1cda440: VA/EGL interfaces af294d1: fix compiling error if GLESv1_CM isn't installed in the default location 2a4fcff: fix the number of the allocated elements 2f484d7: update VA/EGL test case as well 2ac9bac: a test case to use VA/EGL interfaces 731d575: new hooks to create/free native pixmap Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Diffstat (limited to 'va/x11')
-rw-r--r--va/x11/va_x11.c43
1 files changed, 0 insertions, 43 deletions
diff --git a/va/x11/va_x11.c b/va/x11/va_x11.c
index a593712..4f65fd0 100644
--- a/va/x11/va_x11.c
+++ b/va/x11/va_x11.c
@@ -145,47 +145,6 @@ static VAStatus va_DisplayContextGetDriverName (
return vaStatus;
}
-static VAStatus va_CreateNativePixmap(
- VADisplayContextP pDisplayContext,
- unsigned int width,
- unsigned int height,
- void **native_pixmap)
-{
- VADriverContextP ctx = pDisplayContext->pDriverContext;
- Window root_window;
- XWindowAttributes wattr;
- Pixmap pixmap = None;
-
- root_window = RootWindow(ctx->native_dpy, ctx->x11_screen);
- XGetWindowAttributes(ctx->native_dpy, root_window, &wattr);
-
- if (wattr.depth != 24 && wattr.depth != 32)
- return VA_STATUS_ERROR_INVALID_DISPLAY;
-
- pixmap = XCreatePixmap(
- ctx->native_dpy,
- root_window,
- width,
- height,
- wattr.depth
- );
-
- *native_pixmap = (void *)pixmap;
-
- return !pixmap ? VA_STATUS_ERROR_UNKNOWN : VA_STATUS_SUCCESS;
-}
-
-static VAStatus va_FreeNativePixmap(
- VADisplayContextP pDisplayContext,
- void *native_pixmap)
-{
- VADriverContextP ctx = pDisplayContext->pDriverContext;
- Pixmap pixmap = (Pixmap)native_pixmap;
-
- XFreePixmap(ctx->native_dpy, pixmap);
-
- return VA_STATUS_SUCCESS;
-}
VADisplay vaGetDisplay (
Display *native_dpy /* implementation specific */
@@ -215,8 +174,6 @@ VADisplay vaGetDisplay (
pDisplayContext->vaDestroy = va_DisplayContextDestroy;
pDisplayContext->vaGetDriverName = va_DisplayContextGetDriverName;
pDisplayContext->opaque = NULL;
- pDisplayContext->vaCreateNativePixmap = va_CreateNativePixmap;
- pDisplayContext->vaFreeNativePixmap = va_FreeNativePixmap;
pDriverContext->dri_state = dri_state;
dpy = (VADisplay)pDisplayContext;
}