diff options
| author | Damien Lespiau <damien.lespiau@gmail.com> | 2010-07-14 12:45:01 -0400 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2010-07-14 18:16:09 +0100 |
| commit | 54dd00efce5076b8ba053aa1a071b6b31911a781 (patch) | |
| tree | 22b3efb52b9c77b693004b5777d4ff9398af763b | |
| parent | cd46801cd33ff3ae19b85e449f9ceb0a700f1239 (diff) | |
| download | clutter-gst-54dd00efce5076b8ba053aa1a071b6b31911a781.tar.gz | |
build: Fix compilation when using GLES
Some headers do not define APIENTRY or APIENTRYP, define them in this
case. Compile some headers/function that are only used by the ARB fp
renderer.
| -rw-r--r-- | clutter-gst/clutter-gst-video-sink.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c index 3738011..21be86f 100644 --- a/clutter-gst/clutter-gst-video-sink.c +++ b/clutter-gst/clutter-gst-video-sink.c @@ -44,9 +44,12 @@ #include "clutter-gst-video-sink.h" #include "clutter-gst-private.h" #include "clutter-gst-shaders.h" + +#ifdef CLUTTER_COGL_HAS_GL /* include assembly shaders */ #include "I420.h" #include "YV12.h" +#endif #include <gst/gst.h> #include <gst/gstvalue.h> @@ -144,6 +147,15 @@ typedef enum CLUTTER_GST_I420, } ClutterGstVideoFormat; +#ifndef APIENTRYP +# ifdef APIENTRY +# define APIENTRYP APIENTRY * +# else +# define APIENTRY +# define APIENTRYP * +# endif +#endif + typedef void (APIENTRYP GLUNIFORM1IPROC)(GLint location, GLint value); /* GL_ARB_fragment_program */ typedef void (APIENTRYP GLGENPROGRAMSPROC)(GLsizei n, GLuint *programs); @@ -382,6 +394,7 @@ clutter_gst_video_sink_set_priority (ClutterGstVideoSink *sink, * Small helpers */ +#ifdef CLUTTER_COGL_HAS_GL static void _string_array_to_char_array (char *dst, const char *src[]) @@ -395,6 +408,7 @@ _string_array_to_char_array (char *dst, } *dst = '\0'; } +#endif static void _renderer_connect_signals(ClutterGstVideoSink *sink, |