From d7a465f9da93a1c934f67085f4152b8631442cc3 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Wed, 20 Aug 2014 23:23:06 +1000 Subject: [PATCH] gl: add prototypes for KHR_debug/ARB_debug_output --- gst-libs/gst/gl/glprototypes/Makefile.am | 3 ++- gst-libs/gst/gl/glprototypes/all_functions.h | 1 + gst-libs/gst/gl/glprototypes/gstgl_compat.h | 18 ++++++++++++++++++ gst-libs/gst/gl/gstglapi.h | 2 +- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/gst-libs/gst/gl/glprototypes/Makefile.am b/gst-libs/gst/gl/glprototypes/Makefile.am index 6528630..3cb8503 100644 --- a/gst-libs/gst/gl/glprototypes/Makefile.am +++ b/gst-libs/gst/gl/glprototypes/Makefile.am @@ -11,5 +11,6 @@ prototype_HEADERS = \ opengl.h \ shaders.h \ gstgl_compat.h \ - gstgl_gles2compat.h + gstgl_gles2compat.h \ + debug.h diff --git a/gst-libs/gst/gl/glprototypes/all_functions.h b/gst-libs/gst/gl/glprototypes/all_functions.h index 12f9a62..42e0648 100644 --- a/gst-libs/gst/gl/glprototypes/all_functions.h +++ b/gst-libs/gst/gl/glprototypes/all_functions.h @@ -26,3 +26,4 @@ #include "gles.h" #include "opengl.h" #include "shaders.h" +#include "debug.h" diff --git a/gst-libs/gst/gl/glprototypes/gstgl_compat.h b/gst-libs/gst/gl/glprototypes/gstgl_compat.h index 5e1f8bb..726dfce 100644 --- a/gst-libs/gst/gl/glprototypes/gstgl_compat.h +++ b/gst-libs/gst/gl/glprototypes/gstgl_compat.h @@ -37,4 +37,22 @@ typedef ptrdiff_t GLsizeiptr; typedef ptrdiff_t GLintptr; #endif +#if !defined(GST_GL_DEBUG_PROC) +#if defined(GLDEBUGPROC) +#define GST_GL_DEBUG_PROC GLDEBUGPROC +#elif defined(GLDEBUGPROCARB) +#define GST_GL_DEBUG_PROC GLDEBUGPROCARB +#elif defined(GLDEBUGPROCKHR) +#define GST_GL_DEBUG_PROC GLDEBUGPROCKHR +#else +typedef void (GSTGLAPI *GST_GL_DEBUG_PROC) (GLenum source, + GLenum type, + GLuint id, + GLenum severity, + GLsizei length, + const gchar* message, + gpointer user_data); +#endif +#endif + #endif diff --git a/gst-libs/gst/gl/gstglapi.h b/gst-libs/gst/gl/gstglapi.h index b136662..fa6831e 100644 --- a/gst-libs/gst/gl/gstglapi.h +++ b/gst-libs/gst/gl/gstglapi.h @@ -22,7 +22,6 @@ #define __GST_GL_API_H__ #include -#include #if GST_GL_HAVE_PLATFORM_EGL @@ -86,6 +85,7 @@ #else #define GSTGLAPI #endif +#include #include -- 2.7.4