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

glamor: Drop constant arguments to glamor_solid(). 

After keithp's change to drop the old glamor_fill() code, nothing ever
changed these values.

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Eric Anholt 2014-04-06 07:22:26 -07:00
parent db9bff5c38
commit d71ecbb458
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glamor/glamor_glyphs.c
View File

@ -168,7 +168,7 @@ clear_mask_cache(struct glamor_glyph_mask_cache *maskcache)
struct glamor_glyph_mask_cache_entry *mce; struct glamor_glyph_mask_cache_entry *mce;
glamor_solid(maskcache->pixmap, 0, CACHE_PICTURE_SIZE, CACHE_PICTURE_SIZE, glamor_solid(maskcache->pixmap, 0, CACHE_PICTURE_SIZE, CACHE_PICTURE_SIZE,
MASK_CACHE_MAX_SIZE, GXcopy, 0xFFFFFFFF, 0); MASK_CACHE_MAX_SIZE, 0);
mce = &maskcache->mcache[0]; mce = &maskcache->mcache[0];
while (cnt--) { while (cnt--) {
mce->width = 0; mce->width = 0;
@ -1433,7 +1433,7 @@ glamor_glyphs_via_mask(CARD8 op,
glamor_destroy_pixmap(mask_pixmap); glamor_destroy_pixmap(mask_pixmap);
return; return;
} }
glamor_solid(mask_pixmap, 0, 0, width, height, GXcopy, 0xFFFFFFFF, 0); glamor_solid(mask_pixmap, 0, 0, width, height, 0);
component_alpha = NeedsComponent(mask_format->format); component_alpha = NeedsComponent(mask_format->format);
mask = CreatePicture(0, &mask_pixmap->drawable, mask = CreatePicture(0, &mask_pixmap->drawable,
mask_format, CPComponentAlpha, mask_format, CPComponentAlpha,

1
glamor/glamor_priv.h
View File

@ -1025,7 +1025,6 @@ void glamor_composite_rectangles(CARD8 op,
/* glamor_util.c */ /* glamor_util.c */
void void
glamor_solid(PixmapPtr pixmap, int x, int y, int width, int height, glamor_solid(PixmapPtr pixmap, int x, int y, int width, int height,
unsigned char alu, unsigned long planemask,
unsigned long fg_pixel); unsigned long fg_pixel);
void void

3
glamor/glamor_trapezoid.c
View File

@ -1393,8 +1393,7 @@ _glamor_generate_trapezoid_with_shader(ScreenPtr screen, PicturePtr picture,
/* First, clear all to zero */ /* First, clear all to zero */
glamor_solid(pixmap, 0, 0, pixmap_priv->base.pixmap->drawable.width, glamor_solid(pixmap, 0, 0, pixmap_priv->base.pixmap->drawable.width,
pixmap_priv->base.pixmap->drawable.height, pixmap_priv->base.pixmap->drawable.height, 0);
GXclear, 0xFFFFFFFF, 0);
glamor_make_current(glamor_priv); glamor_make_current(glamor_priv);

9
glamor/glamor_utils.c
View File

@ -56,21 +56,18 @@ glamor_solid_boxes(PixmapPtr pixmap,
void void
glamor_solid(PixmapPtr pixmap, int x, int y, int width, int height, glamor_solid(PixmapPtr pixmap, int x, int y, int width, int height,
unsigned char alu, unsigned long planemask,
unsigned long fg_pixel) unsigned long fg_pixel)
{ {
DrawablePtr drawable = &pixmap->drawable; DrawablePtr drawable = &pixmap->drawable;
GCPtr gc; GCPtr gc;
ChangeGCVal vals[3]; ChangeGCVal vals[1];
xRectangle rect; xRectangle rect;
vals[0].val = alu; vals[0].val = fg_pixel;
vals[1].val = planemask;
vals[2].val = fg_pixel;
gc = GetScratchGC(drawable->depth, drawable->pScreen); gc = GetScratchGC(drawable->depth, drawable->pScreen);
if (!gc) if (!gc)
return; return;
ChangeGC(NullClient, gc, GCFunction|GCPlaneMask|GCForeground, vals); ChangeGC(NullClient, gc, GCForeground, vals);
ValidateGC(drawable, gc); ValidateGC(drawable, gc);
rect.x = x; rect.x = x;
rect.y = y; rect.y = y;