From 0c755f690951652bd1d3e3f9a2fd01de0c7f6522 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Thu, 5 May 2011 16:09:22 +0100 Subject: [PATCH] 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 file changed, 1 insertion(+), 5 deletions(-) diff --git a/clutter/cogl/pango/cogl-pango-display-list.c b/clutter/cogl/pango/cogl-pango-display-list.c index 7749058f5..6226a81cd 100644 --- a/clutter/cogl/pango/cogl-pango-display-list.c +++ b/clutter/cogl/pango/cogl-pango-display-list.c @@ -27,7 +27,6 @@ #include #include -#include #include #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);