Partial support for Mesa GL ES v1 and v2

v1 does not work and v2 does not compile but nevermind...

diff --git a/configure.ac b/configure.ac
index c5c82a96a62e02cbdbe0122460f24beef480858d..12f297a6dac67fc5073a9e202ab5e446f6ee4062 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3247,8 +3247,11 @@ AC_SUBST([GL_CFLAGS])
 AC_SUBST([GL_LIBS])
 
 dnl
-dnl  EGL
+dnl  OpenGL
 dnl
+PKG_ENABLE_MODULES_VLC([GL], [], [gl], [OpenGL support], [auto])
+PKG_ENABLE_MODULES_VLC([GLES1], [], [glesv1_cm], [OpenGL ES v1 support], [auto])
+PKG_ENABLE_MODULES_VLC([GLES2], [], [glesv2], [OpenGL ES v2 support], [auto])
 PKG_ENABLE_MODULES_VLC([EGL], [], [egl], [EGL support], [auto])
 
 dnl

diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index 66e27075c927b34e0ac0e9624f731bcb506ecdcf..ce7c0c8f91317f7ba63d0623c332d68a0cde31ad 100644 (file)
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -15,16 +15,33 @@ SOURCES_yuv = yuv.c
 SOURCES_vout_macosx = macosx.m opengl.h opengl.c
 SOURCES_vout_ios = ios.m opengl.h opengl.c
 
+
 ### OpenGL ###
 # TODO: merge all three source files (?)
-libopengl_plugin_la_SOURCES = \
-       opengl.c opengl.h \
-       gl.c
-libopengl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
-libopengl_plugin_la_LIBADD = $(AM_LIBADD) $(GL_LIBS)
-libopengl_plugin_la_DEPENDENCIES =
-EXTRA_LTLIBRARIES += libopengl_plugin.la
-libvlc_LTLIBRARIES += $(LTLIBopengl)
+libgles2_plugin_la_SOURCES = opengl.c opengl.h gl.c
+libgles2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES2_CFLAGS) -DUSE_OPENGL_ES=2
+libgles2_plugin_la_LIBADD = $(AM_LIBADD) $(GLES2_LIBS)
+libgles2_plugin_la_DEPENDENCIES =
+
+libgles1_plugin_la_SOURCES = opengl.c opengl.h gl.c
+libgles1_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES1_CFLAGS) -DUSE_OPENGL_ES=1
+libgles1_plugin_la_LIBADD = $(AM_LIBADD) $(GLES1_LIBS)
+libgles1_plugin_la_DEPENDENCIES =
+
+libgl_plugin_la_SOURCES = opengl.c opengl.h gl.c
+libgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
+libgl_plugin_la_LIBADD = $(AM_LIBADD) $(GL_LIBS)
+libgl_plugin_la_DEPENDENCIES =
+
+EXTRA_LTLIBRARIES += \
+       libgles2_plugin.la \
+       libgles1_plugin.la \
+       libgl_plugin.la
+libvlc_LTLIBRARIES += \
+       $(LTLIBgles2) \
+       $(LTLIBgles1) \
+       $(LTLIBgl)
+
 
 ### XCB ###
 libxcb_x11_plugin_la_SOURCES = \

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 52570501a5de68d9896ff973c287856f9144d345..06bbfc2b20d2763eb173d67107bf77f7bd3ac556 100644 (file)
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -32,13 +32,23 @@
 #include "opengl.h"
 // Define USE_OPENGL_ES to the GL ES Version you want to select
 
-#if USE_OPENGL_ES == 1
-# include <OpenGLES/ES1/glext.h>
-#elif USE_OPENGL_ES == 2
-# include <OpenGLES/ES2/glext.h>
-#elif defined(__APPLE__)
-# define MACOS_OPENGL
-# include <OpenGL/glext.h>
+#if !defined (__APPLE__)
+# if USE_OPENGL_ES == 2
+#  include <GLES2/gl2ext.h>
+# elif USE_OPENGL_ES == 1
+#  include <GLES/glext.h>
+//# else
+//# include <GL/glext.h>
+# endif
+#else
+# if USE_OPENGL_ES == 2
+#  include <OpenGLES/ES2/gl.h>
+# elif USE_OPENGL_ES == 1
+#  include <OpenGLES/ES1/gl.h>
+# else
+#  define MACOS_OPENGL
+#  include <OpenGL/glext.h>
+# endif
 #endif
 
 #ifndef YCBCR_MESA

diff --git a/modules/video_output/opengl.h b/modules/video_output/opengl.h
index 6423788db9e37823b9d0670f673a5e6363512f91..c8ab7de1719011b5b5b62b17209bc924fd344ede 100644 (file)
--- a/modules/video_output/opengl.h
+++ b/modules/video_output/opengl.h
@@ -36,17 +36,25 @@
 
 #define VLCGL_TEXTURE_COUNT 1
 
-#if USE_OPENGL_ES == 1
-# include <OpenGLES/ES1/gl.h>
-#elif USE_OPENGL_ES == 2
-# include <OpenGLES/ES2/gl.h>
-#elif defined(__APPLE__)
-# define MACOS_OPENGL
-# include <OpenGL/gl.h>
-# undef VLCGL_TEXTURE_COUNT
-# define VLCGL_TEXTURE_COUNT 2
+#if !defined (__APPLE__)
+# if USE_OPENGL_ES == 2
+#  include <GLES2/gl2.h>
+# elif USE_OPENGL_ES == 1
+#  include <GLES/gl.h>
+# else
+#  include <GL/gl.h>
+# endif
 #else
-# include <GL/gl.h>
+# if USE_OPENGL_ES == 2
+#  include <OpenGLES/ES2/gl.h>
+# elif USE_OPENGL_ES == 1
+#  include <OpenGLES/ES1/gl.h>
+# else
+#  define MACOS_OPENGL
+#  include <OpenGL/gl.h>
+#  undef VLCGL_TEXTURE_COUNT
+#  define VLCGL_TEXTURE_COUNT 2
+# endif
 #endif
 
 typedef struct {