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

randr: use local variables where possible 

This will allow us to make the code more readable, and the lines will
fit within 80 columns.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Emil Velikov 2015-03-19 12:19:23 +00:00
parent 93ef0e580e
commit 363cd0e0b4
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
randr/rrcrtc.c
View File

@ -394,7 +394,7 @@ rrCreateSharedPixmap(RRCrtcPtr crtc, int width, int height,
Bool ret; Bool ret;
int depth; int depth;
PixmapPtr mscreenpix; PixmapPtr mscreenpix;
PixmapPtr protopix = crtc->pScreen->current_master->GetScreenPixmap(crtc->pScreen->current_master); PixmapPtr protopix = master->GetScreenPixmap(master);
rrScrPriv(crtc->pScreen); rrScrPriv(crtc->pScreen);
/* create a pixmap on the master screen, /* create a pixmap on the master screen,
@ -457,18 +457,20 @@ rrCheckPixmapBounding(ScreenPtr pScreen,
/* have to iterate all the crtcs of the attached gpu masters /* have to iterate all the crtcs of the attached gpu masters
and all their output slaves */ and all their output slaves */
for (c = 0; c < pScrPriv->numCrtcs; c++) { for (c = 0; c < pScrPriv->numCrtcs; c++) {
if (pScrPriv->crtcs[c] == rr_crtc) { RRCrtcPtr crtc = pScrPriv->crtcs[c];
if (crtc == rr_crtc) {
newbox.x1 = x; newbox.x1 = x;
newbox.x2 = x + w; newbox.x2 = x + w;
newbox.y1 = y; newbox.y1 = y;
newbox.y2 = y + h; newbox.y2 = y + h;
} else { } else {
if (!pScrPriv->crtcs[c]->mode) if (!crtc->mode)
continue; continue;
newbox.x1 = pScrPriv->crtcs[c]->x; newbox.x1 = crtc->x;
newbox.x2 = pScrPriv->crtcs[c]->x + pScrPriv->crtcs[c]->mode->mode.width; newbox.x2 = crtc->x + crtc->mode->mode.width;
newbox.y1 = pScrPriv->crtcs[c]->y; newbox.y1 = crtc->y;
newbox.y2 = pScrPriv->crtcs[c]->y + pScrPriv->crtcs[c]->mode->mode.height; newbox.y2 = crtc->y + crtc->mode->mode.height;
} }
RegionInit(&new_crtc_region, &newbox, 1); RegionInit(&new_crtc_region, &newbox, 1);
RegionUnion(&total_region, &total_region, &new_crtc_region); RegionUnion(&total_region, &total_region, &new_crtc_region);
@ -477,19 +479,21 @@ rrCheckPixmapBounding(ScreenPtr pScreen,
xorg_list_for_each_entry(slave, &pScreen->output_slave_list, output_head) { xorg_list_for_each_entry(slave, &pScreen->output_slave_list, output_head) {
rrScrPrivPtr slave_priv = rrGetScrPriv(slave); rrScrPrivPtr slave_priv = rrGetScrPriv(slave);
for (c = 0; c < slave_priv->numCrtcs; c++) { for (c = 0; c < slave_priv->numCrtcs; c++) {
if (slave_priv->crtcs[c] == rr_crtc) { RRCrtcPtr slave_crtc = slave_priv->crtcs[c];
if (slave_crtc == rr_crtc) {
newbox.x1 = x; newbox.x1 = x;
newbox.x2 = x + w; newbox.x2 = x + w;
newbox.y1 = y; newbox.y1 = y;
newbox.y2 = y + h; newbox.y2 = y + h;
} }
else { else {
if (!slave_priv->crtcs[c]->mode) if (!slave_crtc->mode)
continue; continue;
newbox.x1 = slave_priv->crtcs[c]->x; newbox.x1 = slave_crtc->x;
newbox.x2 = slave_priv->crtcs[c]->x + slave_priv->crtcs[c]->mode->mode.width; newbox.x2 = slave_crtc->x + slave_crtc->mode->mode.width;
newbox.y1 = slave_priv->crtcs[c]->y; newbox.y1 = slave_crtc->y;
newbox.y2 = slave_priv->crtcs[c]->y + slave_priv->crtcs[c]->mode->mode.height; newbox.y2 = slave_crtc->y + slave_crtc->mode->mode.height;
} }
RegionInit(&new_crtc_region, &newbox, 1); RegionInit(&new_crtc_region, &newbox, 1);
RegionUnion(&total_region, &total_region, &new_crtc_region); RegionUnion(&total_region, &total_region, &new_crtc_region);