[gtk/wip/chergert/glproto: 472/493] remove simple batch merging

[Christian Hergert <chergert src gnome org>]

commit 2f1ad5b4967b795542169a44b92ec0364e1c6f5f
Author: Christian Hergert <chergert redhat com>
Date:   Tue Feb 16 16:01:51 2021 -0800

    remove simple batch merging
    
    this doesnt make sense because it will never hit now that we always have
    full uniform state.
    
    we'll need something else to see how we can find merge targets going
    forward, but this isn't it.

 gsk/next/gskglcommandqueue.c | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)
---
diff --git a/gsk/next/gskglcommandqueue.c b/gsk/next/gskglcommandqueue.c
index 26f6328fcc..06d2f89cbe 100644
--- a/gsk/next/gskglcommandqueue.c
+++ b/gsk/next/gskglcommandqueue.c
@@ -485,29 +485,7 @@ gsk_gl_command_queue_end_draw (GskGLCommandQueue *self)
   else
     last_batch = NULL;
 
-  /* Do simple chaining of draw to last batch. */
-  /* TODO: Use merging capabilities for out-or-order batching */
-#if 0
-  if (batch->draw.uniform_count == 0 &&
-      batch->draw.bind_count == 0 &&
-      last_batch != NULL &&
-      last_batch->any.kind == GSK_GL_COMMAND_KIND_DRAW &&
-      last_batch->any.program == batch->any.program &&
-      last_batch->any.viewport.width == batch->any.viewport.width &&
-      last_batch->any.viewport.height == batch->any.viewport.height &&
-      last_batch->draw.framebuffer == batch->draw.framebuffer &&
-      last_batch->draw.vbo_offset + last_batch->draw.vbo_count == batch->draw.vbo_offset)
-    {
-      last_batch->draw.vbo_count += batch->draw.vbo_count;
-      discard_batch (self);
-    }
-  else
-    {
-      enqueue_batch (self);
-    }
-#else
-      enqueue_batch (self);
-#endif
+  enqueue_batch (self);
 
   self->in_draw = FALSE;
   self->program_info = NULL;