Commit 5f700c3a authored by Keith Packard's avatar Keith Packard

glamor: Use glamor_program for glamor_glyphblt

This constructs suitable shaders using the glamor_program
infrastructure for poly glyph blt, and then gets rid of the no-op
wrapper of miImageGlyphBlt.

Improves x11perf -f8text by 11.6221% +/- 1.04585% (n=10)
Signed-off-by: Keith Packard's avatarKeith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt's avatarEric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt's avatarEric Anholt <eric@anholt.net>
parent 3411e8c5
......@@ -430,9 +430,9 @@ GCOps glamor_gc_ops = {
.PolyText16 = miPolyText16,
.ImageText8 = miImageText8,
.ImageText16 = miImageText16,
.ImageGlyphBlt = glamor_image_glyph_blt, //miImageGlyphBlt,
.PolyGlyphBlt = glamor_poly_glyph_blt, //miPolyGlyphBlt,
.PushPixels = glamor_push_pixels, //miPushPixels,
.ImageGlyphBlt = miImageGlyphBlt,
.PolyGlyphBlt = glamor_poly_glyph_blt,
.PushPixels = glamor_push_pixels,
};
/**
......
This diff is collapsed.
......@@ -230,6 +230,9 @@ typedef struct glamor_screen_private {
/* glamor rect shaders */
glamor_program_fill poly_fill_rect_program;
/* glamor glyphblt shaders */
glamor_program_fill poly_glyph_blt_progs;
/* vertext/elment_index buffer object for render */
GLuint vbo, ebo;
/** Next offset within the VBO that glamor_get_vbo_space() will use. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment