mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/buffer-count-test: teardown after the test

Browse Source 
Might be a bit of an overkill, but still. One should cleanup after
themselves.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Emil Velikov
2016-11-14 17:08:18 +00:00
committed by Daniel Stone
parent 02639554e7
commit a69b870e1d
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/buffer-count-test.c
+17 -3
View File
@@ -39,6 +39,7 @@
struct test_data { struct test_data {
struct client *client; struct client *client;
struct wl_egl_window *native_window;
EGLDisplay egl_dpy; EGLDisplay egl_dpy;
EGLContext egl_ctx; EGLContext egl_ctx;
@@ -49,7 +50,6 @@ struct test_data {
static int static int
init_egl(struct test_data *test_data) init_egl(struct test_data *test_data)
{ {
struct wl_egl_window *native_window;
struct surface *surface = test_data->client->surface; struct surface *surface = test_data->client->surface;
const char *str, *mesa; const char *str, *mesa;
@@ -94,14 +94,15 @@ init_egl(struct test_data *test_data)
if (!test_data->egl_ctx) if (!test_data->egl_ctx)
fail("eglCreateContext"); fail("eglCreateContext");
native_window = test_data->native_window =
wl_egl_window_create(surface->wl_surface, wl_egl_window_create(surface->wl_surface,
surface->width, surface->width,
surface->height); surface->height);
test_data->egl_surface = test_data->egl_surface =
weston_platform_create_egl_surface(test_data->egl_dpy, weston_platform_create_egl_surface(test_data->egl_dpy,
test_data->egl_conf, test_data->egl_conf,
native_window, NULL); test_data->native_window,
NULL);
ret = eglMakeCurrent(test_data->egl_dpy, test_data->egl_surface, ret = eglMakeCurrent(test_data->egl_dpy, test_data->egl_surface,
test_data->egl_surface, test_data->egl_ctx); test_data->egl_surface, test_data->egl_ctx);
@@ -122,6 +123,17 @@ init_egl(struct test_data *test_data)
return 0; return 0;
} }
static void
fini_egl(struct test_data *test_data)
{
eglMakeCurrent(test_data->egl_dpy, EGL_NO_SURFACE, EGL_NO_SURFACE,
EGL_NO_CONTEXT);
weston_platform_destroy_egl_surface(test_data->egl_dpy,
test_data->egl_surface);
wl_egl_window_destroy(test_data->native_window);
eglTerminate(test_data->egl_dpy);
}
TEST(test_buffer_count) TEST(test_buffer_count)
{ {
struct test_data test_data; struct test_data test_data;
@@ -155,4 +167,6 @@ TEST(test_buffer_count)
/* The implementation should only end up creating two buffers /* The implementation should only end up creating two buffers
* and cycling between them */ * and cycling between them */
assert(buffer_count == 2); assert(buffer_count == 2);
fini_egl(&test_data);
} }