frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor: Use glamor_program for glamor_push_pixels 

This uses the same shaders as glamor_poly_glyph_blt.

v2: Wrap some long lines (changes by anholt).

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Keith Packard 2014-03-21 18:03:07 -07:00 committed by Eric Anholt
parent 45ebc4e3fa
commit 51075ebd37
1 changed files with 66 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
glamor/glamor_glyphblt.c
View File

@ -56,7 +56,8 @@ glamor_poly_glyph_blt_gl(DrawablePtr drawable, GCPtr gc,
glamor_make_current(glamor_priv); glamor_make_current(glamor_priv);
prog = glamor_use_program_fill(pixmap, gc, &glamor_priv->poly_glyph_blt_progs, prog = glamor_use_program_fill(pixmap, gc,
&glamor_priv->poly_glyph_blt_progs,
&glamor_facet_poly_glyph_blt); &glamor_facet_poly_glyph_blt);
if (!prog) if (!prog)
goto bail_ctx; goto bail_ctx;
@ -74,7 +75,8 @@ glamor_poly_glyph_blt_gl(DrawablePtr drawable, GCPtr gc,
int off_x, off_y; int off_x, off_y;
char *vbo_offset; char *vbo_offset;
glamor_set_destination_drawable(drawable, box_x, box_y, FALSE, TRUE, prog->matrix_uniform, &off_x, &off_y); glamor_set_destination_drawable(drawable, box_x, box_y, FALSE, TRUE,
prog->matrix_uniform, &off_x, &off_y);
max_points = 500; max_points = 500;
num_points = 0; num_points = 0;
@ -105,10 +107,12 @@ glamor_poly_glyph_blt_gl(DrawablePtr drawable, GCPtr gc,
if (!num_points) { if (!num_points) {
points = glamor_get_vbo_space(screen, points = glamor_get_vbo_space(screen,
max_points * (2 * sizeof (INT16)), max_points *
(2 * sizeof (INT16)),
&vbo_offset); &vbo_offset);
glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_SHORT, glVertexAttribPointer(GLAMOR_VERTEX_POS,
2, GL_SHORT,
GL_FALSE, 0, vbo_offset); GL_FALSE, 0, vbo_offset);
} }
@ -149,7 +153,8 @@ glamor_poly_glyph_blt(DrawablePtr drawable, GCPtr gc,
int start_x, int y, unsigned int nglyph, int start_x, int y, unsigned int nglyph,
CharInfoPtr *ppci, void *pglyph_base) CharInfoPtr *ppci, void *pglyph_base)
{ {
if (glamor_poly_glyph_blt_gl(drawable, gc, start_x, y, nglyph, ppci, pglyph_base)) if (glamor_poly_glyph_blt_gl(drawable, gc, start_x, y, nglyph, ppci,
pglyph_base))
return; return;
miPolyGlyphBlt(drawable, gc, start_x, y, nglyph, miPolyGlyphBlt(drawable, gc, start_x, y, nglyph,
ppci, pglyph_base); ppci, pglyph_base);
@ -160,10 +165,13 @@ glamor_poly_glyph_blt_nf(DrawablePtr drawable, GCPtr gc,
int start_x, int y, unsigned int nglyph, int start_x, int y, unsigned int nglyph,
CharInfoPtr *ppci, void *pglyph_base) CharInfoPtr *ppci, void *pglyph_base)
{ {
if (glamor_poly_glyph_blt_gl(drawable, gc, start_x, y, nglyph, ppci, pglyph_base)) if (glamor_poly_glyph_blt_gl(drawable, gc, start_x, y, nglyph, ppci,
pglyph_base))
return TRUE; return TRUE;
if (glamor_ddx_fallback_check_pixmap(drawable) && glamor_ddx_fallback_check_gc(gc)) if (glamor_ddx_fallback_check_pixmap(drawable) &&
glamor_ddx_fallback_check_gc(gc)) {
return FALSE; return FALSE;
}
miPolyGlyphBlt(drawable, gc, start_x, y, nglyph, miPolyGlyphBlt(drawable, gc, start_x, y, nglyph,
ppci, pglyph_base); ppci, pglyph_base);
return TRUE; return TRUE;
@ -179,8 +187,8 @@ glamor_image_glyph_blt_nf(DrawablePtr drawable, GCPtr gc,
} }
static Bool static Bool
glamor_push_pixels_points(GCPtr gc, PixmapPtr bitmap, glamor_push_pixels_gl(GCPtr gc, PixmapPtr bitmap,
DrawablePtr drawable, int w, int h, int x, int y) DrawablePtr drawable, int w, int h, int x, int y)
{ {
ScreenPtr screen = drawable->pScreen; ScreenPtr screen = drawable->pScreen;
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen); glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
@ -188,65 +196,40 @@ glamor_push_pixels_points(GCPtr gc, PixmapPtr bitmap,
glamor_pixmap_private *pixmap_priv; glamor_pixmap_private *pixmap_priv;
uint8_t *bitmap_data = bitmap->devPrivate.ptr; uint8_t *bitmap_data = bitmap->devPrivate.ptr;
int bitmap_stride = bitmap->devKind; int bitmap_stride = bitmap->devKind;
int off_x, off_y; glamor_program *prog;
RegionPtr clip = gc->pCompositeClip;
int box_x, box_y;
int yy, xx; int yy, xx;
GLfloat xscale, yscale; int num_points;
float color[4]; INT16 *points = NULL;
unsigned long fg_pixel = gc->fgPixel;
float *points, *next_point;
int num_points = 0;
char *vbo_offset; char *vbo_offset;
RegionPtr clip;
if (w * h > MAXINT / (2 * sizeof(float))) if (w * h > MAXINT / (2 * sizeof(float)))
return FALSE; goto bail;
if (gc->fillStyle != FillSolid) {
glamor_fallback("gc fillstyle not solid\n");
return FALSE;
}
pixmap_priv = glamor_get_pixmap_private(pixmap); pixmap_priv = glamor_get_pixmap_private(pixmap);
if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv)) if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv))
return FALSE; goto bail;
glamor_make_current(glamor_priv); glamor_make_current(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);
return FALSE;
}
}
if (!glamor_set_planemask(pixmap, gc->planemask)) { prog = glamor_use_program_fill(pixmap, gc,
glamor_fallback("Failed to set planemask in %s.\n", __FUNCTION__); &glamor_priv->poly_glyph_blt_progs,
return FALSE; &glamor_facet_poly_glyph_blt);
} if (!prog)
goto bail_ctx;
glamor_get_drawable_deltas(drawable, pixmap, &off_x, &off_y); glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
glamor_set_destination_pixmap_priv_nc(pixmap_priv); points = glamor_get_vbo_space(screen, w * h * sizeof(INT16) * 2,
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); &vbo_offset);
next_point = points; num_points = 0;
clip = fbGetCompositeClip(gc);
/* Note that because fb sets miTranslate in the GC, our incoming X /* Note that because fb sets miTranslate in the GC, our incoming X
* and Y are in screen coordinate space (same for spans, but not * and Y are in screen coordinate space (same for spans, but not
* other operations). * other operations).
*/ */
for (yy = 0; yy < h; yy++) { for (yy = 0; yy < h; yy++) {
uint8_t *bitmap_row = bitmap_data + yy * bitmap_stride; uint8_t *bitmap_row = bitmap_data + yy * bitmap_stride;
for (xx = 0; xx < w; xx++) { for (xx = 0; xx < w; xx++) {
@ -255,63 +238,58 @@ glamor_push_pixels_points(GCPtr gc, PixmapPtr bitmap,
x + xx, x + xx,
y + yy, y + yy,
NULL)) { NULL)) {
next_point[0] = v_from_x_coord_x(xscale, x + xx + off_x + 0.5); *points++ = x + xx;
if (glamor_priv->yInverted) *points++ = y + yy;
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++; num_points++;
} }
} }
} }
glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT, glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_SHORT,
GL_FALSE, 2 * sizeof(float), GL_FALSE, 0, vbo_offset);
vbo_offset);
glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
glamor_put_vbo_space(screen); glamor_put_vbo_space(screen);
glDrawArrays(GL_POINTS, 0, num_points); glamor_pixmap_loop(pixmap_priv, box_x, box_y) {
glamor_set_destination_drawable(drawable, box_x, box_y, FALSE, TRUE,
prog->matrix_uniform, NULL, NULL);
glDisableVertexAttribArray(GLAMOR_VERTEX_POS); glDrawArrays(GL_POINTS, 0, num_points);
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); glDisable(GL_COLOR_LOGIC_OP);
glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
return TRUE; return TRUE;
bail_ctx:
glDisable(GL_COLOR_LOGIC_OP);
bail:
return FALSE;
} }
void void
glamor_push_pixels(GCPtr pGC, PixmapPtr pBitmap, glamor_push_pixels(GCPtr pGC, PixmapPtr pBitmap,
DrawablePtr pDrawable, int w, int h, int x, int y) DrawablePtr pDrawable, int w, int h, int x, int y)
{ {
_glamor_push_pixels(pGC, pBitmap, pDrawable, w, h, x, y, TRUE); if (glamor_push_pixels_gl(pGC, pBitmap, pDrawable, w, h, x, y))
return;
miPushPixels(pGC, pBitmap, pDrawable, w, h, x, y);
} }
Bool Bool
glamor_push_pixels_nf(GCPtr pGC, PixmapPtr pBitmap, glamor_push_pixels_nf(GCPtr gc, PixmapPtr bitmap,
DrawablePtr pDrawable, int w, int h, int x, int y) DrawablePtr drawable, int w, int h, int x, int y)
{ {
return _glamor_push_pixels(pGC, pBitmap, pDrawable, w, h, x, y, FALSE); if (glamor_push_pixels_gl(gc, bitmap, drawable, w, h, x, y))
return TRUE;
if (glamor_ddx_fallback_check_pixmap(drawable) &&
glamor_ddx_fallback_check_pixmap(&bitmap->drawable) &&
glamor_ddx_fallback_check_gc(gc))
{
return FALSE;
}
miPushPixels(gc, bitmap, drawable, w, h, x, y);
return TRUE;
} }