mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-03 04:52:28 +00:00
[665/906] mosaic: fix a couple of assertions
This commit is contained in:
parent
e55b2ae671
commit
8bf203f536
1 changed files with 4 additions and 3 deletions
|
@ -212,7 +212,8 @@ static void
|
||||||
gst_gl_mosaic_callback (gpointer stuff)
|
gst_gl_mosaic_callback (gpointer stuff)
|
||||||
{
|
{
|
||||||
GstGLMosaic *mosaic = GST_GL_MOSAIC (stuff);
|
GstGLMosaic *mosaic = GST_GL_MOSAIC (stuff);
|
||||||
GstGLFuncs *gl = GST_GL_MIXER (mosaic)->display->gl_vtable;
|
GstGLMixer *mixer = GST_GL_MIXER (mosaic);
|
||||||
|
GstGLFuncs *gl = mixer->display->gl_vtable;
|
||||||
|
|
||||||
static GLfloat xrot = 0;
|
static GLfloat xrot = 0;
|
||||||
static GLfloat yrot = 0;
|
static GLfloat yrot = 0;
|
||||||
|
@ -234,7 +235,7 @@ gst_gl_mosaic_callback (gpointer stuff)
|
||||||
|
|
||||||
guint count = 0;
|
guint count = 0;
|
||||||
|
|
||||||
gst_gl_display_clear_shader (NULL);
|
gst_gl_display_clear_shader (mixer->display);
|
||||||
gl->BindTexture (GL_TEXTURE_RECTANGLE_ARB, 0);
|
gl->BindTexture (GL_TEXTURE_RECTANGLE_ARB, 0);
|
||||||
gl->Disable (GL_TEXTURE_RECTANGLE_ARB);
|
gl->Disable (GL_TEXTURE_RECTANGLE_ARB);
|
||||||
|
|
||||||
|
@ -359,7 +360,7 @@ gst_gl_mosaic_callback (gpointer stuff)
|
||||||
|
|
||||||
gl->Disable (GL_DEPTH_TEST);
|
gl->Disable (GL_DEPTH_TEST);
|
||||||
|
|
||||||
gst_gl_display_clear_shader (NULL);
|
gst_gl_display_clear_shader (mixer->display);
|
||||||
|
|
||||||
xrot += 0.6f;
|
xrot += 0.6f;
|
||||||
yrot += 0.4f;
|
yrot += 0.4f;
|
||||||
|
|
Loading…
Reference in a new issue