summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMatthew Waters <matthew@centricular.com>2017-03-14 14:15:00 +1100
committerMatthew Waters <matthew@centricular.com>2017-03-14 14:15:00 +1100
commitefc015f27deca351e4f7cca1ebf6bc23bad6fd71 (patch)
treec4eff99ce3b74cabcf0def88e8a2c0f2b2d4da1f /tests
parentb01ae6e5e69bd04763b6b75cc978d0d9874514bc (diff)
downloadgstreamer-plugins-bad-efc015f27deca351e4f7cca1ebf6bc23bad6fd71.tar.gz
gl: GL_ARRAY_BUFFER is not a part of VAO state
As a result we need to bind it on every draw in order to have the correct state in the GL state machine.
Diffstat (limited to 'tests')
-rw-r--r--tests/check/libs/gstglcontext.c6
-rw-r--r--tests/check/libs/gstglupload.c6
2 files changed, 4 insertions, 8 deletions
diff --git a/tests/check/libs/gstglcontext.c b/tests/check/libs/gstglcontext.c
index 96c5d92cd..c0b91178c 100644
--- a/tests/check/libs/gstglcontext.c
+++ b/tests/check/libs/gstglcontext.c
@@ -239,15 +239,13 @@ blit_tex (gpointer data)
if (gl->GenVertexArrays)
gl->BindVertexArray (vao);
- else
- _bind_buffer (context);
+ _bind_buffer (context);
gl->DrawElements (GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, 0);
if (gl->GenVertexArrays)
gl->BindVertexArray (0);
- else
- _unbind_buffer (context);
+ _unbind_buffer (context);
return TRUE;
}
diff --git a/tests/check/libs/gstglupload.c b/tests/check/libs/gstglupload.c
index 7508cf5b9..d03691685 100644
--- a/tests/check/libs/gstglupload.c
+++ b/tests/check/libs/gstglupload.c
@@ -237,8 +237,7 @@ blit_tex (gpointer data)
if (gl->GenVertexArrays)
gl->BindVertexArray (vao);
- else
- _bind_buffer (context);
+ _bind_buffer (context);
gl->ActiveTexture (GL_TEXTURE0);
gl->BindTexture (GL_TEXTURE_2D, tex_id);
@@ -248,8 +247,7 @@ blit_tex (gpointer data)
if (gl->GenVertexArrays)
gl->BindVertexArray (0);
- else
- _unbind_buffer (context);
+ _unbind_buffer (context);
return TRUE;
}