From 554b23ae4895094717e95ed50ba3cbf0be4899d4 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Fri, 15 Jan 2016 17:00:55 +1100 Subject: [PATCH] glquery: provide compat definition for GL_QUERY_RESULT e.g. android doesn't have it While we're here move a state specific assertion after the supported check. Removes an assertion on GLES --- gst-libs/gst/gl/gstglquery.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gst-libs/gst/gl/gstglquery.c b/gst-libs/gst/gl/gstglquery.c index 4e8378fe61..ff759255e0 100644 --- a/gst-libs/gst/gl/gstglquery.c +++ b/gst-libs/gst/gl/gstglquery.c @@ -36,6 +36,10 @@ #define GL_TIMESTAMP 0x8E28 #endif +#ifndef GL_QUERY_RESULT +#define GL_QUERY_RESULT 0x8866 +#endif + #define GST_CAT_DEFAULT gst_gl_query_debug GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); @@ -203,10 +207,10 @@ gst_gl_query_end (GstGLQuery * query) g_return_if_fail (query != NULL); g_return_if_fail (_query_type_supports_begin_end (query->query_type)); - g_return_if_fail (query->start_called); if (!query->supported) return; + g_return_if_fail (query->start_called); GST_TRACE ("%p end query type \'%s\' id %u", query, _query_type_to_string (query->query_type), query->query_id);