X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_output%2Fopengl.h;h=55705d1383daf24597b802e5e8905525d74cc9af;hb=da08af353ab8d171cd1dbb9b1baf21075e5315e2;hp=a513ef3d8a39f525d5a3c1dc10979bc3f97b2ca5;hpb=9aef14d5e54f06229a11dbccccd5805482734a18;p=vlc

diff --git a/modules/video_output/opengl.h b/modules/video_output/opengl.h
index a513ef3d8a..55705d1383 100644
--- a/modules/video_output/opengl.h
+++ b/modules/video_output/opengl.h
@@ -1,59 +1,59 @@
 /*****************************************************************************
  * opengl.h: OpenGL vout_display helpers
  *****************************************************************************
- * Copyright (C) 2004 the VideoLAN team
+ * Copyright (C) 2004-2013 VLC authors and VideoLAN
  * Copyright (C) 2009 Laurent Aimar
  *
- * Authors: Cyril Deguet <asmax@videolan.org>
- *          Gildas Bazin <gbazin@videolan.org>
- *          Eric Petit <titer@m0k.org>
- *          Cedric Cocquebert <cedric.cocquebert@supelec.fr>
- *          Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
+ * Authors: Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
+ *          Rémi Denis-Courmont
+ *          Jean-Baptiste Kempf <jb@videolan.org>
+ *          Ilkka Ollakka <ileoo@videolan.org>
+ *          Felix Paul Kühne <fkuehne at videolan dot org>
+ *          Rafaël Carré <funman@videolanorg>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #include <vlc_common.h>
 #include <vlc_picture_pool.h>
 #include <vlc_opengl.h>
 
+/* Change USE_OPENGL_ES value to set the OpenGL ES version (1, 2) you want to use
+ * A value of 0 will activate normal OpenGL */
 #ifdef __APPLE__
 # include <TargetConditionals.h>
 # if !TARGET_OS_IPHONE
+#  define USE_OPENGL_ES 0
 #  define MACOS_OPENGL
 #  include <OpenGL/gl.h>
-# else
-#  define USE_OPENGL_ES 1
+# else /* Force ESv2 on iOS */
+#  define USE_OPENGL_ES 2
 #  include <OpenGLES/ES1/gl.h>
 #  include <OpenGLES/ES2/gl.h>
 #  include <OpenGLES/ES2/glext.h>
 # endif
-#endif
-
-// Define USE_OPENGL_ES to the GL ES Version you want to select
-#ifndef USE_OPENGL_ES
-# define USE_OPENGL_ES 0
-#endif
-
-#if !defined (__APPLE__)
+#else /* !defined (__APPLE__) */
+# ifndef USE_OPENGL_ES
+#  define USE_OPENGL_ES 0
+# endif
 # if USE_OPENGL_ES == 2
 #  include <GLES2/gl2.h>
 # elif USE_OPENGL_ES == 1
 #  include <GLES/gl.h>
 # else
-#  ifdef WIN32
+#  ifdef _WIN32
 #   include <GL/glew.h>
 #   undef glClientActiveTexture
 #   undef glActiveTexture