Add rudimentary tests for DRI3
This is a simple little test to create a pixmap from a local bo, copy it to a normal pixmap, then read it back by importing it into anther local bo. It tests the fundamental mechanisms of opening a DRI3 render device, importing into pixmaps, exporting into /buffers and a read-barrier. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson
parent
d6240d197b
commit
6ab6734369
|
|
@ -239,6 +239,9 @@ if test "x$shm" = "xyes"; then
|
|||
AC_MSG_RESULT(assuming no))
|
||||
fi
|
||||
|
||||
PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"])
|
||||
AM_CONDITIONAL(X11_DRI3, test "x$x11_dri3" = "xyes" -a "x$shm" = "xyes")
|
||||
|
||||
AC_ARG_ENABLE(tools,
|
||||
AS_HELP_STRING([--disable-tools],
|
||||
[Enable building and installing the miscellaneous tools [default=auto]]),
|
||||
|
|
|
|||
|
|
@ -22,3 +22,4 @@ vsync.avi
|
|||
dri2-race
|
||||
dri2-swap
|
||||
dri2-test
|
||||
dri3-test
|
||||
|
|
|
|||
|
|
@ -30,6 +30,11 @@ stress_TESTS += \
|
|||
$(NULL)
|
||||
endif
|
||||
|
||||
if X11_DRI3
|
||||
stress_TESTS += \
|
||||
dri3-test \
|
||||
$(NULL)
|
||||
endif
|
||||
check_PROGRAMS = $(stress_TESTS)
|
||||
|
||||
noinst_PROGRAMS = lowlevel-blt-bench
|
||||
|
|
@ -53,6 +58,15 @@ libtest_la_SOURCES += \
|
|||
$(NULL)
|
||||
endif
|
||||
|
||||
if X11_DRI3
|
||||
libtest_la_SOURCES += \
|
||||
dri3.c \
|
||||
dri3.h \
|
||||
$(NULL)
|
||||
AM_CFLAGS += $(X11_DRI3_CFLAGS)
|
||||
LDADD += $(X11_DRI3_LIBS)
|
||||
endif
|
||||
|
||||
vsync.avi: mkvsync.sh
|
||||
./mkvsync.sh $@
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,130 @@
|
|||
/*
|
||||
* Copyright (c) 2014 Intel Corporation
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) shall be included in all copies or substantial portions of the
|
||||
* Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xlib-xcb.h>
|
||||
#include <X11/xshmfence.h>
|
||||
#include <xcb/xcb.h>
|
||||
#include <xcb/dri3.h>
|
||||
#include <xcb/sync.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "dri3.h"
|
||||
|
||||
Pixmap dri3_create_pixmap(Display *dpy,
|
||||
Drawable draw,
|
||||
int width, int height, int depth,
|
||||
int fd, int bpp, int stride, int size)
|
||||
{
|
||||
xcb_connection_t *c = XGetXCBConnection(dpy);
|
||||
xcb_pixmap_t pixmap = xcb_generate_id(c);
|
||||
xcb_dri3_pixmap_from_buffer(c, pixmap, draw, size, width, height, stride, depth, bpp, fd);
|
||||
return pixmap;
|
||||
}
|
||||
|
||||
int dri3_create_fd(Display *dpy,
|
||||
Pixmap pixmap,
|
||||
int *stride)
|
||||
{
|
||||
xcb_connection_t *c = XGetXCBConnection(dpy);
|
||||
xcb_dri3_buffer_from_pixmap_cookie_t cookie;
|
||||
xcb_dri3_buffer_from_pixmap_reply_t *reply;
|
||||
|
||||
cookie = xcb_dri3_buffer_from_pixmap(c, pixmap);
|
||||
reply = xcb_dri3_buffer_from_pixmap_reply(c, cookie, NULL);
|
||||
if (!reply)
|
||||
return -1;
|
||||
|
||||
if (reply->nfd != 1)
|
||||
return -1;
|
||||
|
||||
*stride = reply->stride;
|
||||
return xcb_dri3_buffer_from_pixmap_reply_fds(c, reply)[0];
|
||||
}
|
||||
|
||||
int dri3_create_fence(Display *dpy, Pixmap pixmap, struct dri3_fence *fence)
|
||||
{
|
||||
xcb_connection_t *c = XGetXCBConnection(dpy);
|
||||
struct dri3_fence f;
|
||||
int fd;
|
||||
|
||||
fd = xshmfence_alloc_shm();
|
||||
if (fd < 0)
|
||||
return -1;
|
||||
|
||||
f.addr = xshmfence_map_shm(fd);
|
||||
if (f.addr == NULL) {
|
||||
close(fd);
|
||||
return -1;
|
||||
}
|
||||
|
||||
f.xid = xcb_generate_id(c);
|
||||
xcb_dri3_fence_from_fd(c, pixmap, f.xid, 0, fd);
|
||||
|
||||
*fence = f;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void dri3_fence_sync(Display *dpy, struct dri3_fence *fence)
|
||||
{
|
||||
xcb_connection_t *c = XGetXCBConnection(dpy);
|
||||
|
||||
xshmfence_reset(fence->addr);
|
||||
|
||||
xcb_sync_trigger_fence(c, fence->xid);
|
||||
xcb_flush(c);
|
||||
|
||||
xshmfence_await(fence->addr);
|
||||
}
|
||||
|
||||
void dri3_fence_free(Display *dpy, struct dri3_fence *fence)
|
||||
{
|
||||
xcb_connection_t *c = XGetXCBConnection(dpy);
|
||||
|
||||
xshmfence_unmap_shm(fence->addr);
|
||||
xcb_sync_destroy_fence(c, fence->xid);
|
||||
}
|
||||
|
||||
int dri3_open__full(Display *dpy, Window root, unsigned provider)
|
||||
{
|
||||
xcb_connection_t *c = XGetXCBConnection(dpy);
|
||||
xcb_dri3_open_cookie_t cookie;
|
||||
xcb_dri3_open_reply_t *reply;
|
||||
|
||||
cookie = xcb_dri3_open(c, root, provider);
|
||||
reply = xcb_dri3_open_reply(c, cookie, NULL);
|
||||
|
||||
if (!reply)
|
||||
return -1;
|
||||
|
||||
if (reply->nfd != 1)
|
||||
return -1;
|
||||
|
||||
return xcb_dri3_open_reply_fds(c, reply)[0];
|
||||
}
|
||||
|
||||
int dri3_open(Display *dpy)
|
||||
{
|
||||
return dri3_open__full(dpy, RootWindow(dpy, DefaultScreen(dpy)), None);
|
||||
}
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
/*
|
||||
* Copyright (c) 2014 Intel Corporation
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) shall be included in all copies or substantial portions of the
|
||||
* Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef DRI3_H
|
||||
#define DRI3_H
|
||||
|
||||
#include <X11/X.h>
|
||||
|
||||
int dri3_open(Display *dpy);
|
||||
int dri3_open__full(Display *dpy, Window root, unsigned provider);
|
||||
|
||||
Pixmap dri3_create_pixmap(Display *dpy,
|
||||
Drawable draw,
|
||||
int width, int height, int depth,
|
||||
int fd, int bpp, int stride, int size);
|
||||
int dri3_create_fd(Display *dpy,
|
||||
Pixmap pixmap,
|
||||
int *stride);
|
||||
|
||||
struct dri3_fence {
|
||||
XID xid;
|
||||
void *addr;
|
||||
};
|
||||
|
||||
int dri3_create_fence(Display *dpy, Pixmap pixmap, struct dri3_fence *out);
|
||||
void dri3_fence_sync(Display *dpy, struct dri3_fence *fence);
|
||||
void dri3_fence_free(Display *dpy, struct dri3_fence *fence);
|
||||
|
||||
#endif /* DRI3_H */
|
||||
Loading…
Reference in New Issue