From 9afab22dd9c5703953e3d40f23a3ad1b5ec8f8cf Mon Sep 17 00:00:00 2001
From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Date: Fri, 14 Aug 2015 18:07:15 +0200
Subject: [PATCH] gtkglsink: Remove reset path

The reset path is bogus and there is no reason to get rid of these
things during resize.
---
 ext/gtk/gtkgstbasewidget.c |  3 ---
 ext/gtk/gtkgstbasewidget.h |  3 ---
 ext/gtk/gtkgstglwidget.c   | 42 ------------------------------------------
 3 files changed, 48 deletions(-)

diff --git a/ext/gtk/gtkgstbasewidget.c b/ext/gtk/gtkgstbasewidget.c
index d5ba788..4202a22 100644
--- a/ext/gtk/gtkgstbasewidget.c
+++ b/ext/gtk/gtkgstbasewidget.c
@@ -200,9 +200,6 @@ _queue_draw (GtkGstBaseWidget * widget)
   if (widget->pending_resize) {
     widget->pending_resize = FALSE;
 
-    if (widget->reset)
-      widget->reset (widget);
-
     widget->v_info = widget->pending_v_info;
     widget->negotiated = TRUE;
     widget->new_buffer = TRUE;
diff --git a/ext/gtk/gtkgstbasewidget.h b/ext/gtk/gtkgstbasewidget.h
index a402385..0a05ca5 100644
--- a/ext/gtk/gtkgstbasewidget.h
+++ b/ext/gtk/gtkgstbasewidget.h
@@ -63,9 +63,6 @@ struct _GtkGstBaseWidget
   guint display_ratio_num;
   guint display_ratio_den;
 
-  /* Poor-man virtual */
-  void (*reset) (GtkGstBaseWidget * widget);
-
   /*< private >*/
   GMutex lock;
   GWeakRef element;
diff --git a/ext/gtk/gtkgstglwidget.c b/ext/gtk/gtkgstglwidget.c
index 378632c..9984281 100644
--- a/ext/gtk/gtkgstglwidget.c
+++ b/ext/gtk/gtkgstglwidget.c
@@ -343,49 +343,11 @@ _reset_gl (GtkGstGLWidget * gst_widget)
 }
 
 static void
-_reset (GtkGstBaseWidget * base_widget)
-{
-  GtkGstGLWidgetPrivate *priv = GTK_GST_GL_WIDGET (base_widget)->priv;
-
-  priv->initted = FALSE;
-  priv->vao = 0;
-  priv->vertex_buffer = 0;
-  priv->attr_position = 0;
-  priv->attr_texture = 0;
-  priv->current_tex = 0;
-
-  gtk_gl_area_set_has_alpha (GTK_GL_AREA (base_widget),
-      !base_widget->ignore_alpha);
-}
-
-/* called from main thread */
-static void
-gtk_gst_gl_widget_reset (GtkGstBaseWidget * base_widget)
-{
-  GtkGstGLWidgetPrivate *priv = GTK_GST_GL_WIDGET (base_widget)->priv;
-  const GstGLFuncs *gl = priv->other_context->gl_vtable;
-
-  _reset (base_widget);
-
-  if (priv->vao) {
-    gl->DeleteVertexArrays (1, &priv->vao);
-    priv->vao = 0;
-  }
-
-  if (priv->vertex_buffer) {
-    gl->DeleteBuffers (1, &priv->vertex_buffer);
-    priv->vertex_buffer = 0;
-  }
-}
-
-static void
 gtk_gst_gl_widget_finalize (GObject * object)
 {
   GtkGstGLWidgetPrivate *priv = GTK_GST_GL_WIDGET (object)->priv;
   GtkGstBaseWidget *base_widget = GTK_GST_BASE_WIDGET (object);
 
-  _reset (base_widget);
-
   if (priv->other_context)
     _invoke_on_main ((ThreadFunc) _reset_gl, base_widget);
 
@@ -404,14 +366,12 @@ gtk_gst_gl_widget_class_init (GtkGstGLWidgetClass * klass)
 {
   GObjectClass *gobject_klass = (GObjectClass *) klass;
   GtkGLAreaClass *gl_widget_klass = (GtkGLAreaClass *) klass;
-  GtkGstBaseWidget *base_widget_klass = (GtkGstBaseWidget *) klass;
 
   g_type_class_add_private (klass, sizeof (GtkGstGLWidgetPrivate));
   gtk_gst_base_widget_class_init (GTK_GST_BASE_WIDGET_CLASS (klass));
 
   gobject_klass->finalize = gtk_gst_gl_widget_finalize;
   gl_widget_klass->render = gtk_gst_gl_widget_render;
-  base_widget_klass->reset = gtk_gst_gl_widget_reset;
 }
 
 static void
@@ -451,8 +411,6 @@ gtk_gst_gl_widget_init (GtkGstGLWidget * gst_widget)
       !base_widget->ignore_alpha);
 }
 
-
-
 static void
 _get_gl_context (GtkGstGLWidget * gst_widget)
 {
-- 
2.7.4