[vlc-devel] [PATCH 1/3] opengl: gl_common: remove explicit defines

Alexandre Janniaux ajanni at videolabs.io
Wed Nov 4 17:53:59 CET 2020


They are defined from the buildsystem already, leading to redefinition
warnings, and they don't make any sense if not compiling an iOS module
that need to be linked with the platform, for example when compiling the
vgl module.
---
 modules/video_output/opengl/gl_common.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/video_output/opengl/gl_common.h b/modules/video_output/opengl/gl_common.h
index 60f0873442..198e1b8e0b 100644
--- a/modules/video_output/opengl/gl_common.h
+++ b/modules/video_output/opengl/gl_common.h
@@ -28,11 +28,9 @@
 #ifdef __APPLE__
 # include <TargetConditionals.h>
 # if !TARGET_OS_IPHONE
-#  undef USE_OPENGL_ES2
 #  define MACOS_OPENGL
 #  include <OpenGL/gl.h>
 # else /* Force ESv2 on iOS */
-#  define USE_OPENGL_ES2
 #  include <OpenGLES/ES1/gl.h>
 #  include <OpenGLES/ES2/gl.h>
 #  include <OpenGLES/ES2/glext.h>
-- 
2.29.2



More information about the vlc-devel mailing list