summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMatthew Waters <matthew@centricular.com>2016-07-12 15:29:29 +1000
committerMatthew Waters <matthew@centricular.com>2016-07-26 14:07:24 +1000
commit06b4b52a2092b54cc6c10ca0c23e57f17782d994 (patch)
treeadfd83bf2addfb4ff802d316008c2ae64d7de9b5 /tests
parent518e8a3fd2e1e29f6435df46eb1c9e2d63aa46ef (diff)
glcontext: remove not thread-safe get/set_error()
Use GError's instead if necessary.
Diffstat (limited to 'tests')
-rw-r--r--tests/check/libs/gstglmemory.c12
-rw-r--r--tests/check/libs/gstglupload.c6
2 files changed, 2 insertions, 16 deletions
diff --git a/tests/check/libs/gstglmemory.c b/tests/check/libs/gstglmemory.c
index f8f9840cf..0cdd1ddc8 100644
--- a/tests/check/libs/gstglmemory.c
+++ b/tests/check/libs/gstglmemory.c
@@ -102,10 +102,6 @@ GST_START_TEST (test_basic)
&gl_mem->info) == FALSE);
fail_if (gl_mem->mem.context != gl_mem2->mem.context);
- if (gst_gl_context_get_error ())
- printf ("%s\n", gst_gl_context_get_error ());
- fail_if (gst_gl_context_get_error () != NULL);
-
gst_gl_allocation_params_free ((GstGLAllocationParams *) params);
gst_memory_unref (mem);
gst_memory_unref (mem2);
@@ -272,10 +268,6 @@ test_transfer_allocator (const gchar * allocator_name)
fail_unless (GST_MEMORY_FLAG_IS_SET (mem3,
GST_GL_BASE_MEMORY_TRANSFER_NEED_DOWNLOAD));
- if (gst_gl_context_get_error ())
- printf ("%s\n", gst_gl_context_get_error ());
- fail_if (gst_gl_context_get_error () != NULL);
-
gst_memory_unref (mem);
gst_memory_unref (mem2);
gst_memory_unref (mem3);
@@ -334,10 +326,6 @@ GST_START_TEST (test_separate_transfer)
/* FIXME: add download transfer */
- if (gst_gl_context_get_error ())
- printf ("%s\n", gst_gl_context_get_error ());
- fail_if (gst_gl_context_get_error () != NULL);
-
gst_memory_unref (mem);
gst_object_unref (gl_allocator);
}
diff --git a/tests/check/libs/gstglupload.c b/tests/check/libs/gstglupload.c
index 4f9e4b2b7..7257597ca 100644
--- a/tests/check/libs/gstglupload.c
+++ b/tests/check/libs/gstglupload.c
@@ -165,8 +165,7 @@ GST_START_TEST (test_upload_data)
0, WIDTH * HEIGHT * 4, NULL, NULL);
res = gst_gl_upload_perform_with_buffer (upload, inbuf, &outbuf);
- fail_if (res == FALSE, "Failed to upload buffer: %s\n",
- gst_gl_context_get_error ());
+ fail_if (res == FALSE, "Failed to upload buffer");
fail_unless (GST_IS_BUFFER (outbuf));
res = gst_buffer_map (outbuf, &map_info, GST_MAP_READ | GST_MAP_GL);
@@ -238,8 +237,7 @@ GST_START_TEST (test_upload_buffer)
gst_gl_upload_set_caps (upload, in_caps, out_caps);
res = gst_gl_upload_perform_with_buffer (upload, buffer, &outbuf);
- fail_if (res == FALSE, "Failed to upload buffer: %s\n",
- gst_gl_context_get_error ());
+ fail_if (res == FALSE, "Failed to upload buffer");
fail_unless (GST_IS_BUFFER (outbuf));
gst_gl_window_set_preferred_size (window, WIDTH, HEIGHT);