mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-13 10:55:34 +00:00
gl: Allow using non-system mesa with both GL and GLES
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:
parent
0061913f08
commit
8f4ba29f97
1 changed files with 11 additions and 0 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue