glshader: enable glshader on GLES2

diff --git a/ext/gl/Makefile.am b/ext/gl/Makefile.am
index 5e9f437..7ec63b3 100644 (file)
--- a/ext/gl/Makefile.am
+++ b/ext/gl/Makefile.am
@@ -7,8 +7,6 @@ AM_LIBS = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS)
 # full opengl required
 if USE_OPENGL
 OPENGL_SOURCES =  \
-       gstglfiltershader.c \
-       gstglfiltershader.h \
        gstglfilterblur.c \
        gstglfilterblur.h \
        gstglfiltersobel.c \
@@ -74,6 +72,8 @@ libgstopengl_la_SOURCES = \
        gstglcolorscale.h \
        gstglvideomixer.c \
        gstglvideomixer.h \
+       gstglfiltershader.c \
+       gstglfiltershader.h \
        $(OPENGL_SOURCES)
 
 if HAVE_GRAPHENE

diff --git a/ext/gl/gstglfiltershader.c b/ext/gl/gstglfiltershader.c
index 71130e6..5da6ed4 100644 (file)
--- a/ext/gl/gstglfiltershader.c
+++ b/ext/gl/gstglfiltershader.c
@@ -36,13 +36,6 @@
 #include "config.h"
 #endif
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <string.h>
-
 #include <gst/gst.h>
 #include <gst/gl/gstglshadervariables.h>
 

diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c
index fbe5b27..a4b2540 100644 (file)
--- a/ext/gl/gstopengl.c
+++ b/ext/gl/gstopengl.c
@@ -49,6 +49,7 @@
 #include "gstgleffects.h"
 #include "gstglcolorscale.h"
 #include "gstglvideomixer.h"
+#include "gstglfiltershader.h"
 #if HAVE_GRAPHENE
 #include "gstgltransformation.h"
 #endif
@@ -60,7 +61,6 @@
 #include "gstglfilterapp.h"
 #include "gstglfilterblur.h"
 #include "gstglfilterreflectedscreen.h"
-#include "gstglfiltershader.h"
 #include "gstglfiltersobel.h"
 #include "gstgldeinterlace.h"
 #include "gstglmosaic.h"
@@ -129,6 +129,10 @@ plugin_init (GstPlugin * plugin)
           GST_RANK_NONE, GST_TYPE_GL_VIDEO_MIXER)) {
     return FALSE;
   }
+  if (!gst_element_register (plugin, "glshader",
+          GST_RANK_NONE, gst_gl_filtershader_get_type ())) {
+    return FALSE;
+  }
 #if GST_GL_HAVE_OPENGL
   if (!gst_element_register (plugin, "gltestsrc",
           GST_RANK_NONE, GST_TYPE_GL_TEST_SRC)) {
@@ -140,11 +144,6 @@ plugin_init (GstPlugin * plugin)
     return FALSE;
   }
 
-  if (!gst_element_register (plugin, "glshader",
-          GST_RANK_NONE, gst_gl_filtershader_get_type ())) {
-    return FALSE;
-  }
-
   if (!gst_element_register (plugin, "glfiltersobel",
           GST_RANK_NONE, gst_gl_filtersobel_get_type ())) {
     return FALSE;