mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-03 01:02:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl: Allow using non-system mesa with both GL and GLES

Browse source 
GCC automatically disable redundance warnings for system headers. As
soon as we start using a non-system installed mesa, we would start
having issues. The test for both wasn't setting any flags, so it would
work but then fail at runtime.

This is being fixed by disabling in the code (where needed only) that
GCC warning. The test is also fixed to avoid the false positive we had.
This commit is contained in:
Nicolas Dufresne 2015-12-15 19:25:16 -05:00 committed by Tim-Philipp Müller
parent 0061913f08
commit 8f4ba29f97
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst-libs/gst/gl/gstglapi.h
View file

@ -23,6 +23,13 @@
#include <gst/gl/gstglconfig.h>
/* This mimic GCC behaviour with system headers files even if GL headers may
* not be in the system header path. */
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wredundant-decls"
#endif
/* OpenGL 2.0 for Embedded Systems */
#if GST_GL_HAVE_GLES2
#ifndef GL_GLEXT_PROTOTYPES
@ -57,6 +64,10 @@
# endif
#endif
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#ifdef WINAPI
#define GSTGLAPI WINAPI
#else