diff options
author | Matthew Waters <matthew@centricular.com> | 2015-08-10 16:38:32 +0200 |
---|---|---|
committer | Matthew Waters <matthew@centricular.com> | 2015-08-10 16:38:32 +0200 |
commit | b7777b91812c58dc5f8a365c1e13b3de7116ead4 (patch) | |
tree | b13b80f50dd7f18012e17455d7cec4380637ddcd /gst-libs | |
parent | 1a6fe3db40ec3a0946f2870ebb25a9ebed55245f (diff) | |
download | gstreamer-plugins-bad-b7777b91812c58dc5f8a365c1e13b3de7116ead4.tar.gz |
gl: use gles2 shaders everywhere
This effectively limits a glfilter subclass to be > GL(ES) 2.0.
rather than a possible GL 1.4.
Diffstat (limited to 'gst-libs')
-rw-r--r-- | gst-libs/gst/gl/gstglfilter.c | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/gst-libs/gst/gl/gstglfilter.c b/gst-libs/gst/gl/gstglfilter.c index b2d3945f3..600b7c7c6 100644 --- a/gst-libs/gst/gl/gstglfilter.c +++ b/gst-libs/gst/gl/gstglfilter.c @@ -1124,37 +1124,7 @@ gst_gl_filter_draw_texture (GstGLFilter * filter, GLuint texture, GST_DEBUG ("drawing texture:%u dimensions:%ux%u", texture, width, height); -#if GST_GL_HAVE_OPENGL - if (gst_gl_context_get_gl_api (context) & GST_GL_API_OPENGL) { - GLfloat verts[] = { -1.0f, -1.0f, - 1.0f, -1.0f, - 1.0f, 1.0f, - -1.0f, 1.0f - }; - GLfloat texcoords[] = { 0.0f, 0.0f, - 1.0f, 0.0f, - 1.0f, 1.0f, - 0.0f, 1.0f - }; - - gl->ActiveTexture (GL_TEXTURE0); - gl->BindTexture (GL_TEXTURE_2D, texture); - - gl->EnableClientState (GL_VERTEX_ARRAY); - gl->VertexPointer (2, GL_FLOAT, 0, &verts); - - gl->ClientActiveTexture (GL_TEXTURE0); - gl->EnableClientState (GL_TEXTURE_COORD_ARRAY); - gl->TexCoordPointer (2, GL_FLOAT, 0, &texcoords); - - gl->DrawArrays (GL_TRIANGLE_FAN, 0, 4); - - gl->DisableClientState (GL_VERTEX_ARRAY); - gl->DisableClientState (GL_TEXTURE_COORD_ARRAY); - } -#endif - if (gst_gl_context_get_gl_api (context) & (GST_GL_API_GLES2 | - GST_GL_API_OPENGL3)) { + { if (!filter->vertex_buffer) { if (gl->GenVertexArrays) { gl->GenVertexArrays (1, &filter->vao); |