diff options
| author | Edward Hervey <edward.hervey@collabora.co.uk> | 2012-08-22 15:23:51 +0200 |
|---|---|---|
| committer | Edward Hervey <edward.hervey@collabora.co.uk> | 2012-09-17 11:09:15 +0200 |
| commit | c9c00290dda717209e1f19faf0f716f4f2739605 (patch) | |
| tree | aaf440c1e1b953c2a37bfbf2bceae98458e7318c | |
| parent | befe626916b10fdb34b3c7da713715b4cd0b4add (diff) | |
video-sink: Don't use GL* values
And only check for target type if using full GL
| -rw-r--r-- | 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); |