mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 01:34:11 +00:00
glamor: use NULL instead of NullClient
No need to have another name for NULL, we can use NULL directly. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
committed by
Enrico Weigelt
parent
a15370629a
commit
bdf867ba60
@@ -97,7 +97,7 @@ glamor_copy_glyph(PixmapPtr glyph_pixmap,
|
||||
}
|
||||
changes[0].val = 0xff;
|
||||
changes[1].val = 0x00;
|
||||
if (ChangeGC(NullClient, scratch_gc,
|
||||
if (ChangeGC(NULL, scratch_gc,
|
||||
GCForeground|GCBackground, changes) != Success) {
|
||||
glamor_destroy_pixmap(upload_pixmap);
|
||||
FreeScratchGC(scratch_gc);
|
||||
|
||||
@@ -110,8 +110,7 @@ glamor_get_dash_pixmap(GCPtr gc)
|
||||
ChangeGCVal changes;
|
||||
|
||||
changes.val = pixel;
|
||||
(void) ChangeGC(NullClient, scratch_gc,
|
||||
GCForeground, &changes);
|
||||
(void) ChangeGC(NULL, scratch_gc, GCForeground, &changes);
|
||||
ValidateGC(&pixmap->drawable, scratch_gc);
|
||||
rect.x = offset;
|
||||
rect.y = 0;
|
||||
|
||||
@@ -254,7 +254,7 @@ glamor_get_stipple_pixmap(GCPtr gc)
|
||||
|
||||
changes[0].val = 0xff;
|
||||
changes[1].val = 0x00;
|
||||
if (ChangeGC(NullClient, scratch_gc,
|
||||
if (ChangeGC(NULL, scratch_gc,
|
||||
GCForeground|GCBackground, changes) != Success)
|
||||
goto bail_gc;
|
||||
ValidateGC(&pixmap->drawable, scratch_gc);
|
||||
|
||||
@@ -46,7 +46,7 @@ glamor_solid_boxes(DrawablePtr drawable,
|
||||
ChangeGCVal vals[1];
|
||||
|
||||
vals[0].val = fg_pixel;
|
||||
ChangeGC(NullClient, gc, GCForeground, vals);
|
||||
ChangeGC(NULL, gc, GCForeground, vals);
|
||||
ValidateGC(drawable, gc);
|
||||
gc->ops->PolyFillRect(drawable, gc, nbox, rect);
|
||||
FreeScratchGC(gc);
|
||||
@@ -67,7 +67,7 @@ glamor_solid(PixmapPtr pixmap, int x, int y, int width, int height,
|
||||
gc = GetScratchGC(drawable->depth, drawable->pScreen);
|
||||
if (!gc)
|
||||
return;
|
||||
ChangeGC(NullClient, gc, GCForeground, vals);
|
||||
ChangeGC(NULL, gc, GCForeground, vals);
|
||||
ValidateGC(drawable, gc);
|
||||
rect.x = x;
|
||||
rect.y = y;
|
||||
|
||||
Reference in New Issue
Block a user