mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-20 04:56:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

opengl: Silence macOS OpenGL deprecations

Browse source 
As of macOS 10.14 the entire OpenGL system is deprecated. No need to
log the general warnings about it. Specific warnings are still enabled.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1123>
This commit is contained in:
Doug Nazar 2021-04-23 14:05:45 -04:00
parent 403e0024f1
commit b14c2e6fb0
8 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst-libs/gst/gl/cocoa/gstglcaopengllayer.m
View file

@ -22,6 +22,10 @@
#include "config.h" #include "config.h"
#endif #endif
#if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1014
# define GL_SILENCE_DEPRECATION
#endif
#include <Cocoa/Cocoa.h> #include <Cocoa/Cocoa.h>
#include "gstglcaopengllayer.h" #include "gstglcaopengllayer.h"

4
gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m
View file

@ -22,6 +22,10 @@
#include "config.h" #include "config.h"
#endif #endif
#if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1014
# define GL_SILENCE_DEPRECATION
#endif
#include <Cocoa/Cocoa.h> #include <Cocoa/Cocoa.h>
#include "gstglcontext_cocoa.h" #include "gstglcontext_cocoa.h"

4
gst-libs/gst/gl/cocoa/gstgldisplay_cocoa.m
View file

@ -22,6 +22,10 @@
#include "config.h" #include "config.h"
#endif #endif
#if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1014
# define GL_SILENCE_DEPRECATION
#endif
#include <Cocoa/Cocoa.h> #include <Cocoa/Cocoa.h>
#include <gst/gl/cocoa/gstgldisplay_cocoa.h> #include <gst/gl/cocoa/gstgldisplay_cocoa.h>

4
gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m
View file

@ -23,6 +23,10 @@
#include "config.h" #include "config.h"
#endif #endif
#if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1014
# define GL_SILENCE_DEPRECATION
#endif
#include <Cocoa/Cocoa.h> #include <Cocoa/Cocoa.h>
#include <QuartzCore/QuartzCore.h> #include <QuartzCore/QuartzCore.h>

3
gst-libs/gst/gl/gstglfuncs.h
View file

@ -55,6 +55,9 @@
/* OpenGL for desktop systems */ /* OpenGL for desktop systems */
#if GST_GL_HAVE_OPENGL #if GST_GL_HAVE_OPENGL
# ifdef __APPLE__ # ifdef __APPLE__
# if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1014
# define GL_SILENCE_DEPRECATION
# endif
# include <OpenGL/OpenGL.h> # include <OpenGL/OpenGL.h>
# include <OpenGL/gl.h> # include <OpenGL/gl.h>
# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 # if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070

3
gst-libs/gst/gl/meson.build
View file

@ -351,6 +351,9 @@ if need_api_opengl != 'no' or need_platform_glx != 'no'
opengl_includes = '' opengl_includes = ''
if host_system == 'darwin' if host_system == 'darwin'
opengl_includes += ''' opengl_includes += '''
#if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1014
# define GL_SILENCE_DEPRECATION
#endif
#include <OpenGL/OpenGL.h> #include <OpenGL/OpenGL.h>
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070

4
tests/examples/gl/cocoa/cocoa-videooverlay.m
View file

@ -18,6 +18,10 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1014
# define GL_SILENCE_DEPRECATION
#endif
#include <Cocoa/Cocoa.h> #include <Cocoa/Cocoa.h>
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/video/videooverlay.h> #include <gst/video/videooverlay.h>

4
tests/examples/gl/qt/qglwtextureshare/cocoa_utils.mm
View file

@ -19,6 +19,10 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1014
# define GL_SILENCE_DEPRECATION
#endif
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
void *qt_current_nsopengl_context() void *qt_current_nsopengl_context()
{ {