[vlc-commits] OpenGL: reorder defines and cosmetics

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Oct 31 17:53:43 2012 +0100| [157d4a8bf1db2ea6631b88ad64ace721a574f9b4] | committer: Jean-Baptiste Kempf

OpenGL: reorder defines and cosmetics

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=157d4a8bf1db2ea6631b88ad64ace721a574f9b4
---

 modules/video_output/opengl.h |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/modules/video_output/opengl.h b/modules/video_output/opengl.h
index a513ef3..1d6b2c7 100644
--- a/modules/video_output/opengl.h
+++ b/modules/video_output/opengl.h
@@ -29,25 +29,23 @@
 #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 */
+#ifndef USE_OPENGL_ES
+# define USE_OPENGL_ES 0
+#endif
 #ifdef __APPLE__
 # include <TargetConditionals.h>
 # if !TARGET_OS_IPHONE
 #  define MACOS_OPENGL
 #  include <OpenGL/gl.h>
-# else
+# else /* Force ESv1 on iOS */
 #  define USE_OPENGL_ES 1
 #  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__) */
 # if USE_OPENGL_ES == 2
 #  include <GLES2/gl2.h>
 # elif USE_OPENGL_ES == 1