diff options
| author | Matthew Waters <ystreet00@gmail.com> | 2013-11-15 18:28:49 +1100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2013-11-26 12:16:15 +0100 |
| commit | fffdcbdd3dde437e10cf6e1b5e40c6958d41e6c1 (patch) | |
| tree | e2cfa8cc2818b6c3e327b6cc3e1367b7b3b09b5b /ext | |
| parent | 685a573841949d3162b7f580f2298813acebd649 (diff) | |
gl: Use GL_TEXTURE_2D instead of GL_TEXTURE_RECTANGLE
We create our textures (in Desktop GL) with GL_TEXTURE_RECTANGLE,
vaapi attempts to bind our texture to GL_TEXTURE_2D which throws a
GL_INVALID_OPERATION error and as thus, no video.
Also, by moving exclusively to GL_TEXTURE_2D and the npot extension
we also remove a difference between the Desktop GL and GLES2 code.
https://bugzilla.gnome.org/show_bug.cgi?id=712287
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/libvisual/visual-gl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/libvisual/visual-gl.c b/ext/libvisual/visual-gl.c index b808ec9..88b4419 100644 --- a/ext/libvisual/visual-gl.c +++ b/ext/libvisual/visual-gl.c @@ -848,8 +848,8 @@ bottom_up_to_top_down (gint width, gint height, guint texture, GstVisualGL * visual) { - glEnable (GL_TEXTURE_RECTANGLE_ARB); - glBindTexture (GL_TEXTURE_RECTANGLE_ARB, texture); + glEnable (GL_TEXTURE_2D); + glBindTexture (GL_TEXTURE_2D, texture); glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -867,8 +867,8 @@ bottom_up_to_top_down (gint width, gint height, guint texture, glVertex2i (-1, -1); glEnd (); - glBindTexture (GL_TEXTURE_RECTANGLE_ARB, 0); - glDisable (GL_TEXTURE_RECTANGLE_ARB); + glBindTexture (GL_TEXTURE_2D, 0); + glDisable (GL_TEXTURE_2D); GST_DEBUG_OBJECT (visual, "bottom up to top down"); } |