[clutter/wip/pango-share-atlas: 9/14] Revert "cogl-pango-display-list: Don't use VBOs if the texture can't handle it"



commit 0c755f690951652bd1d3e3f9a2fd01de0c7f6522
Author: Neil Roberts <neil linux intel com>
Date:   Thu May 5 16:09:22 2011 +0100

    Revert "cogl-pango-display-list: Don't use VBOs if the texture can't handle it"
    
    This reverts commit 32c91793e46e0625a19c0d2bc98d6cd147dff702.
    
    This commit is no longer needed since the display list will now only
    have primitive textures in it.

 clutter/cogl/pango/cogl-pango-display-list.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/clutter/cogl/pango/cogl-pango-display-list.c b/clutter/cogl/pango/cogl-pango-display-list.c
index 7749058..6226a81 100644
--- a/clutter/cogl/pango/cogl-pango-display-list.c
+++ b/clutter/cogl/pango/cogl-pango-display-list.c
@@ -27,7 +27,6 @@
 
 #include <glib.h>
 #include <cogl/cogl.h>
-#include <cogl/cogl-texture-private.h>
 #include <string.h>
 
 #include "cogl-pango-display-list.h"
@@ -326,10 +325,7 @@ _cogl_pango_display_list_render_texture (CoglMaterial *material,
    * with other geometry. */
   /* FIXME: 100 is a number I plucked out of thin air; it would be good
    * to determine this empirically! */
-  if (node->d.texture.verts->len < 100 ||
-      /* We can't use a VBO if the texture can't be hardware repeated
-         because Cogl will reject it */
-      !_cogl_texture_can_hardware_repeat (node->d.texture.texture))
+  if (node->d.texture.verts->len < 100)
     emit_rectangles_through_journal (node);
   else
     emit_vertex_buffer_geometry (node);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]