[clutter-gst] video-sink: Don't use GL* values

[Damien Lespiau <dlespiau src gnome org>]

commit c2a1fbc7be855aa12c41a1480ac008c8bb17d609
Author: Edward Hervey <edward hervey collabora co uk>
Date:   Wed Aug 22 15:23:51 2012 +0200

    video-sink: Don't use GL* values
    
    And only check for target type if using full GL

 clutter-gst/clutter-gst-video-sink.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
index 9bf6367..bbc1f51 100644
--- a/clutter-gst/clutter-gst-video-sink.c
+++ b/clutter-gst/clutter-gst-video-sink.c
@@ -1025,13 +1025,16 @@ clutter_gst_hw_upload (ClutterGstVideoSink * sink, GstBuffer * buffer)
 
   if (G_UNLIKELY (priv->converter == NULL)) {
     CoglHandle tex;
-    GLuint gl_texture;
-    GLenum gl_target;
+    unsigned int gl_texture;
+    unsigned int gl_target;
     GValue value = { 0 };
 
     tex = clutter_texture_get_cogl_texture (priv->texture);
     cogl_texture_get_gl_texture (tex, &gl_texture, &gl_target);
+    /* GL_TEXTURE_2D is always used in GLES2 */
+#ifndef COGL_HAS_GLES2
     g_return_if_fail (gl_target == GL_TEXTURE_2D);
+#endif
 
     g_value_init (&value, G_TYPE_UINT);
     g_value_set_uint (&value, gl_texture);