b695304556
Using the same idea as the previous PushPixels code, just make points for each point in the glyph. This is an advantage over the pushpixels fallback because we can batch the BO mappings and draw calls across glyphs. Improves performance of x11perf -f8text by 773.389% +/- 3.50754% (n=10). Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Markus Wick <markus@selfnet.de>
373 lines
12 KiB
C
373 lines
12 KiB
C
/*
|
|
* Copyright © 2009 Intel Corporation
|
|
* Copyright © 1998 Keith Packard
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
* IN THE SOFTWARE.
|
|
*
|
|
* Authors:
|
|
* Zhigang Gong <zhigang.gong@gmail.com>
|
|
*
|
|
*/
|
|
|
|
#include "glamor_priv.h"
|
|
#include <dixfontstr.h>
|
|
|
|
static Bool
|
|
glamor_poly_glyph_blt_pixels(DrawablePtr drawable, GCPtr gc,
|
|
int x, int y, unsigned int nglyph,
|
|
CharInfoPtr *ppci)
|
|
{
|
|
ScreenPtr screen = drawable->pScreen;
|
|
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
|
|
PixmapPtr pixmap = glamor_get_drawable_pixmap(drawable);
|
|
glamor_pixmap_private *pixmap_priv;
|
|
int off_x, off_y;
|
|
GLfloat xscale, yscale;
|
|
float color[4];
|
|
unsigned long fg_pixel = gc->fgPixel;
|
|
char *vbo_offset;
|
|
RegionPtr clip;
|
|
int num_points, max_points;
|
|
float *points = NULL;
|
|
|
|
x += drawable->x;
|
|
y += drawable->y;
|
|
|
|
if (gc->fillStyle != FillSolid) {
|
|
glamor_fallback("gc fillstyle not solid\n");
|
|
return FALSE;
|
|
}
|
|
|
|
pixmap_priv = glamor_get_pixmap_private(pixmap);
|
|
if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv))
|
|
return FALSE;
|
|
|
|
glamor_get_context(glamor_priv);
|
|
if (!glamor_set_alu(screen, gc->alu)) {
|
|
if (gc->alu == GXclear)
|
|
fg_pixel = 0;
|
|
else {
|
|
glamor_fallback("unsupported alu %x\n", gc->alu);
|
|
glamor_put_context(glamor_priv);
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
if (!glamor_set_planemask(pixmap, gc->planemask)) {
|
|
glamor_fallback("Failed to set planemask in %s.\n", __FUNCTION__);
|
|
glamor_put_context(glamor_priv);
|
|
return FALSE;
|
|
}
|
|
|
|
glamor_get_drawable_deltas(drawable, pixmap, &off_x, &off_y);
|
|
|
|
glamor_set_destination_pixmap_priv_nc(pixmap_priv);
|
|
pixmap_priv_get_dest_scale(pixmap_priv, &xscale, &yscale);
|
|
|
|
glUseProgram(glamor_priv->solid_prog);
|
|
|
|
glamor_get_rgba_from_pixel(fg_pixel,
|
|
&color[0], &color[1], &color[2], &color[3],
|
|
format_for_pixmap(pixmap));
|
|
glUniform4fv(glamor_priv->solid_color_uniform_location, 1, color);
|
|
|
|
clip = fbGetCompositeClip(gc);
|
|
|
|
glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
|
|
|
|
max_points = 500;
|
|
num_points = 0;
|
|
while (nglyph--) {
|
|
CharInfoPtr charinfo = *ppci++;
|
|
int w = GLYPHWIDTHPIXELS(charinfo);
|
|
int h = GLYPHHEIGHTPIXELS(charinfo);
|
|
uint8_t *glyphbits = FONTGLYPHBITS(NULL, charinfo);
|
|
|
|
if (w && h) {
|
|
int glyph_x = x + charinfo->metrics.leftSideBearing;
|
|
int glyph_y = y - charinfo->metrics.ascent;
|
|
int glyph_stride = GLYPHWIDTHBYTESPADDED(charinfo);
|
|
int xx, yy;
|
|
|
|
for (yy = 0; yy < h; yy++) {
|
|
uint8_t *glyph_row = glyphbits + glyph_stride * yy;
|
|
for (xx = 0; xx < w; xx++) {
|
|
int pt_x_i = glyph_x + xx;
|
|
int pt_y_i = glyph_y + yy;
|
|
float pt_x_f, pt_y_f;
|
|
if (!(glyph_row[xx / 8] & (1 << xx % 8)))
|
|
continue;
|
|
|
|
if (!RegionContainsPoint(clip, pt_x_i, pt_y_i, NULL))
|
|
continue;
|
|
|
|
if (!num_points) {
|
|
points = glamor_get_vbo_space(screen,
|
|
max_points * 2 * sizeof(float),
|
|
&vbo_offset);
|
|
|
|
glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT,
|
|
GL_FALSE, 2 * sizeof(float),
|
|
vbo_offset);
|
|
}
|
|
|
|
pt_x_f = v_from_x_coord_x(xscale, pt_x_i + off_x + 0.5);
|
|
if (glamor_priv->yInverted)
|
|
pt_y_f = v_from_x_coord_y_inverted(yscale, pt_y_i + off_y + 0.5);
|
|
else
|
|
pt_y_f = v_from_x_coord_y(yscale, pt_y_i + off_y + 0.5);
|
|
|
|
points[num_points * 2 + 0] = pt_x_f;
|
|
points[num_points * 2 + 1] = pt_y_f;
|
|
num_points++;
|
|
|
|
if (num_points == max_points) {
|
|
glamor_put_vbo_space(screen);
|
|
glDrawArrays(GL_POINTS, 0, num_points);
|
|
num_points = 0;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
x += charinfo->metrics.characterWidth;
|
|
}
|
|
|
|
if (num_points) {
|
|
glamor_put_vbo_space(screen);
|
|
glDrawArrays(GL_POINTS, 0, num_points);
|
|
}
|
|
|
|
glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
|
|
glUseProgram(0);
|
|
|
|
glamor_put_context(glamor_priv);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
static Bool
|
|
_glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
|
|
int x, int y, unsigned int nglyph,
|
|
CharInfoPtr *ppci, void *pglyphBase, Bool fallback)
|
|
{
|
|
if (!fallback && glamor_ddx_fallback_check_pixmap(pDrawable)
|
|
&& glamor_ddx_fallback_check_gc(pGC))
|
|
return FALSE;
|
|
|
|
miImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
|
|
return TRUE;
|
|
}
|
|
|
|
void
|
|
glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
|
|
int x, int y, unsigned int nglyph,
|
|
CharInfoPtr *ppci, void *pglyphBase)
|
|
{
|
|
_glamor_image_glyph_blt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase,
|
|
TRUE);
|
|
}
|
|
|
|
Bool
|
|
glamor_image_glyph_blt_nf(DrawablePtr pDrawable, GCPtr pGC,
|
|
int x, int y, unsigned int nglyph,
|
|
CharInfoPtr *ppci, void *pglyphBase)
|
|
{
|
|
return _glamor_image_glyph_blt(pDrawable, pGC, x, y, nglyph, ppci,
|
|
pglyphBase, FALSE);
|
|
}
|
|
|
|
static Bool
|
|
_glamor_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
|
|
int x, int y, unsigned int nglyph,
|
|
CharInfoPtr *ppci, void *pglyphBase, Bool fallback)
|
|
{
|
|
if (glamor_poly_glyph_blt_pixels(pDrawable, pGC, x, y, nglyph, ppci))
|
|
return TRUE;
|
|
|
|
if (!fallback && glamor_ddx_fallback_check_pixmap(pDrawable)
|
|
&& glamor_ddx_fallback_check_gc(pGC))
|
|
return FALSE;
|
|
|
|
miPolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
|
|
return TRUE;
|
|
}
|
|
|
|
void
|
|
glamor_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
|
|
int x, int y, unsigned int nglyph,
|
|
CharInfoPtr *ppci, void *pglyphBase)
|
|
{
|
|
_glamor_poly_glyph_blt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase,
|
|
TRUE);
|
|
}
|
|
|
|
Bool
|
|
glamor_poly_glyph_blt_nf(DrawablePtr pDrawable, GCPtr pGC,
|
|
int x, int y, unsigned int nglyph,
|
|
CharInfoPtr *ppci, void *pglyphBase)
|
|
{
|
|
return _glamor_poly_glyph_blt(pDrawable, pGC, x, y, nglyph, ppci,
|
|
pglyphBase, FALSE);
|
|
}
|
|
|
|
static Bool
|
|
glamor_push_pixels_points(GCPtr gc, PixmapPtr bitmap,
|
|
DrawablePtr drawable, int w, int h, int x, int y)
|
|
{
|
|
ScreenPtr screen = drawable->pScreen;
|
|
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
|
|
PixmapPtr pixmap = glamor_get_drawable_pixmap(drawable);
|
|
glamor_pixmap_private *pixmap_priv;
|
|
uint8_t *bitmap_data = bitmap->devPrivate.ptr;
|
|
int bitmap_stride = bitmap->devKind;
|
|
int off_x, off_y;
|
|
int yy, xx;
|
|
GLfloat xscale, yscale;
|
|
float color[4];
|
|
unsigned long fg_pixel = gc->fgPixel;
|
|
float *points, *next_point;
|
|
int num_points = 0;
|
|
char *vbo_offset;
|
|
RegionPtr clip;
|
|
|
|
if (w * h > MAXINT / (2 * sizeof(float)))
|
|
return FALSE;
|
|
|
|
if (gc->fillStyle != FillSolid) {
|
|
glamor_fallback("gc fillstyle not solid\n");
|
|
return FALSE;
|
|
}
|
|
|
|
pixmap_priv = glamor_get_pixmap_private(pixmap);
|
|
if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv))
|
|
return FALSE;
|
|
|
|
glamor_get_context(glamor_priv);
|
|
if (!glamor_set_alu(screen, gc->alu)) {
|
|
if (gc->alu == GXclear)
|
|
fg_pixel = 0;
|
|
else {
|
|
glamor_fallback("unsupported alu %x\n", gc->alu);
|
|
glamor_put_context(glamor_priv);
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
if (!glamor_set_planemask(pixmap, gc->planemask)) {
|
|
glamor_fallback("Failed to set planemask in %s.\n", __FUNCTION__);
|
|
glamor_put_context(glamor_priv);
|
|
return FALSE;
|
|
}
|
|
|
|
glamor_get_drawable_deltas(drawable, pixmap, &off_x, &off_y);
|
|
|
|
glamor_set_destination_pixmap_priv_nc(pixmap_priv);
|
|
pixmap_priv_get_dest_scale(pixmap_priv, &xscale, &yscale);
|
|
|
|
glUseProgram(glamor_priv->solid_prog);
|
|
|
|
glamor_get_rgba_from_pixel(fg_pixel,
|
|
&color[0], &color[1], &color[2], &color[3],
|
|
format_for_pixmap(pixmap));
|
|
glUniform4fv(glamor_priv->solid_color_uniform_location, 1, color);
|
|
|
|
points = glamor_get_vbo_space(screen, w * h * sizeof(float) * 2,
|
|
&vbo_offset);
|
|
next_point = points;
|
|
|
|
clip = fbGetCompositeClip(gc);
|
|
|
|
/* Note that because fb sets miTranslate in the GC, our incoming X
|
|
* and Y are in screen coordinate space (same for spans, but not
|
|
* other operations).
|
|
*/
|
|
for (yy = 0; yy < h; yy++) {
|
|
uint8_t *bitmap_row = bitmap_data + yy * bitmap_stride;
|
|
for (xx = 0; xx < w; xx++) {
|
|
if (bitmap_row[xx / 8] & (1 << xx % 8) &&
|
|
RegionContainsPoint(clip,
|
|
x + xx,
|
|
y + yy,
|
|
NULL)) {
|
|
next_point[0] = v_from_x_coord_x(xscale, x + xx + off_x + 0.5);
|
|
if (glamor_priv->yInverted)
|
|
next_point[1] = v_from_x_coord_y_inverted(yscale, y + yy + off_y + 0.5);
|
|
else
|
|
next_point[1] = v_from_x_coord_y(yscale, y + yy + off_y + 0.5);
|
|
|
|
next_point += 2;
|
|
num_points++;
|
|
}
|
|
}
|
|
}
|
|
glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT,
|
|
GL_FALSE, 2 * sizeof(float),
|
|
vbo_offset);
|
|
glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
|
|
|
|
glamor_put_vbo_space(screen);
|
|
|
|
glDrawArrays(GL_POINTS, 0, num_points);
|
|
|
|
glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
|
|
glUseProgram(0);
|
|
|
|
glamor_put_context(glamor_priv);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
static Bool
|
|
_glamor_push_pixels(GCPtr pGC, PixmapPtr pBitmap,
|
|
DrawablePtr pDrawable, int w, int h, int x, int y,
|
|
Bool fallback)
|
|
{
|
|
glamor_pixmap_private *pixmap_priv;
|
|
|
|
if (!fallback && glamor_ddx_fallback_check_pixmap(pDrawable)
|
|
&& glamor_ddx_fallback_check_pixmap(&pBitmap->drawable)
|
|
&& glamor_ddx_fallback_check_gc(pGC))
|
|
return FALSE;
|
|
|
|
pixmap_priv = glamor_get_pixmap_private(pBitmap);
|
|
if (pixmap_priv->type == GLAMOR_MEMORY) {
|
|
if (glamor_push_pixels_points(pGC, pBitmap, pDrawable, w, h, x, y))
|
|
return TRUE;
|
|
}
|
|
|
|
miPushPixels(pGC, pBitmap, pDrawable, w, h, x, y);
|
|
return TRUE;
|
|
}
|
|
|
|
void
|
|
glamor_push_pixels(GCPtr pGC, PixmapPtr pBitmap,
|
|
DrawablePtr pDrawable, int w, int h, int x, int y)
|
|
{
|
|
_glamor_push_pixels(pGC, pBitmap, pDrawable, w, h, x, y, TRUE);
|
|
}
|
|
|
|
Bool
|
|
glamor_push_pixels_nf(GCPtr pGC, PixmapPtr pBitmap,
|
|
DrawablePtr pDrawable, int w, int h, int x, int y)
|
|
{
|
|
return _glamor_push_pixels(pGC, pBitmap, pDrawable, w, h, x, y, FALSE);
|
|
}
|