brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "cogl-pango-display-list: Don't use VBOs if the texture can't handle it"

Browse Source 
This reverts commit 32c91793e4.

This commit is no longer needed since the display list will now only
have primitive textures in it.
This commit is contained in:
Neil Roberts 2011-05-05 16:09:22 +01:00
parent 9cb45144a8
commit 0c755f6909
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clutter/cogl/pango/cogl-pango-display-list.c
View File

@ -27,7 +27,6 @@
#include <glib.h> #include <glib.h>
#include <cogl/cogl.h> #include <cogl/cogl.h>
#include <cogl/cogl-texture-private.h>
#include <string.h> #include <string.h>
#include "cogl-pango-display-list.h" #include "cogl-pango-display-list.h"
@ -326,10 +325,7 @@ _cogl_pango_display_list_render_texture (CoglMaterial *material,
* with other geometry. */ * with other geometry. */
/* FIXME: 100 is a number I plucked out of thin air; it would be good /* FIXME: 100 is a number I plucked out of thin air; it would be good
* to determine this empirically! */ * to determine this empirically! */
if (node->d.texture.verts->len < 100 || 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))
emit_rectangles_through_journal (node); emit_rectangles_through_journal (node);
else else
emit_vertex_buffer_geometry (node); emit_vertex_buffer_geometry (node);