mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-05 02:02:26 +00:00
eglglessink: silence warnings building for RPI related to 'vcos_*'
This commit is contained in:
parent
9a88d737fc
commit
1190a79b19
3 changed files with 34 additions and 9 deletions
|
@ -51,16 +51,26 @@
|
||||||
# include <config.h>
|
# include <config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <gst/gst.h>
|
||||||
|
#include <gst/video/gstvideopool.h>
|
||||||
|
|
||||||
|
#if defined (USE_EGL_RPI) && defined(__GNUC__)
|
||||||
|
#ifndef __VCCOREVER__
|
||||||
|
#define __VCCOREVER__ 0x04000000
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wredundant-decls"
|
||||||
|
#pragma GCC optimize ("gnu89-inline")
|
||||||
|
#endif
|
||||||
|
|
||||||
#define EGL_EGLEXT_PROTOTYPES
|
#define EGL_EGLEXT_PROTOTYPES
|
||||||
#define GL_GLEXT_PROTOTYPES
|
#define GL_GLEXT_PROTOTYPES
|
||||||
|
|
||||||
#include <gst/gst.h>
|
|
||||||
#include <gst/egl/egl.h>
|
#include <gst/egl/egl.h>
|
||||||
#include <gst/video/gstvideopool.h>
|
|
||||||
|
|
||||||
#ifdef HAVE_IOS
|
#ifdef HAVE_IOS
|
||||||
#include <OpenGLES/ES2/gl.h>
|
#include <OpenGLES/ES2/gl.h>
|
||||||
|
|
||||||
#else
|
#else
|
||||||
#include <EGL/egl.h>
|
#include <EGL/egl.h>
|
||||||
#include <EGL/eglext.h>
|
#include <EGL/eglext.h>
|
||||||
|
@ -68,6 +78,11 @@
|
||||||
#include <GLES2/gl2ext.h>
|
#include <GLES2/gl2ext.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined (USE_EGL_RPI) && defined(__GNUC__)
|
||||||
|
#pragma GCC reset_options
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
|
#endif
|
||||||
|
|
||||||
#define GST_EGLGLESSINK_EGL_MIN_VERSION 1
|
#define GST_EGLGLESSINK_EGL_MIN_VERSION 1
|
||||||
|
|
||||||
static const EGLint eglglessink_RGBA8888_attribs[] = {
|
static const EGLint eglglessink_RGBA8888_attribs[] = {
|
||||||
|
|
|
@ -123,18 +123,13 @@
|
||||||
#include <gst/video/gstvideometa.h>
|
#include <gst/video/gstvideometa.h>
|
||||||
#include <gst/video/gstvideopool.h>
|
#include <gst/video/gstvideopool.h>
|
||||||
#include <gst/video/videooverlay.h>
|
#include <gst/video/videooverlay.h>
|
||||||
#include <gst/egl/egl.h>
|
|
||||||
|
|
||||||
#include <EGL/egl.h>
|
#include "gstegladaptation.h"
|
||||||
#include <EGL/eglext.h>
|
|
||||||
#include <GLES2/gl2.h>
|
|
||||||
#include <GLES2/gl2ext.h>
|
|
||||||
|
|
||||||
#ifdef USE_EGL_RPI
|
#ifdef USE_EGL_RPI
|
||||||
#include <bcm_host.h>
|
#include <bcm_host.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "gstegladaptation.h"
|
|
||||||
#include "gsteglglessink.h"
|
#include "gsteglglessink.h"
|
||||||
|
|
||||||
GST_DEBUG_CATEGORY_STATIC (gst_eglglessink_debug);
|
GST_DEBUG_CATEGORY_STATIC (gst_eglglessink_debug);
|
||||||
|
|
|
@ -46,6 +46,16 @@
|
||||||
# include <config.h>
|
# include <config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined (USE_EGL_RPI) && defined(__GNUC__)
|
||||||
|
#ifndef __VCCOREVER__
|
||||||
|
#define __VCCOREVER__ 0x04000000
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wredundant-decls"
|
||||||
|
#pragma GCC optimize ("gnu89-inline")
|
||||||
|
#endif
|
||||||
|
|
||||||
#define EGL_EGLEXT_PROTOTYPES
|
#define EGL_EGLEXT_PROTOTYPES
|
||||||
#define GL_GLEXT_PROTOTYPES
|
#define GL_GLEXT_PROTOTYPES
|
||||||
#include <EGL/egl.h>
|
#include <EGL/egl.h>
|
||||||
|
@ -53,6 +63,11 @@
|
||||||
#include <GLES2/gl2.h>
|
#include <GLES2/gl2.h>
|
||||||
#include <GLES2/gl2ext.h>
|
#include <GLES2/gl2ext.h>
|
||||||
|
|
||||||
|
#if defined (USE_EGL_RPI) && defined(__GNUC__)
|
||||||
|
#pragma GCC reset_options
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
|
|
Loading…
Reference in a new issue