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

randr: Eliminate -Wshadow warnings 

Don't use rrScrPriv for nested screen private fetching.

Eliminate a duplicate fetch of the randr screen private in rrCheckPixmapBounding.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Keith Packard 2013-12-15 01:57:09 -08:00
parent f46c487625
commit 9888770654
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
randr/rrcrtc.c
View File

@ -475,21 +475,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) {
rrScrPriv(slave); rrScrPrivPtr slave_priv = rrGetScrPriv(slave);
for (c = 0; c < pScrPriv->numCrtcs; c++) for (c = 0; c < slave_priv->numCrtcs; c++)
if (pScrPriv->crtcs[c] == rr_crtc) { if (slave_priv->crtcs[c] == 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 (!slave_priv->crtcs[c]->mode)
continue; continue;
newbox.x1 = pScrPriv->crtcs[c]->x; newbox.x1 = slave_priv->crtcs[c]->x;
newbox.x2 = pScrPriv->crtcs[c]->x + pScrPriv->crtcs[c]->mode->mode.width; newbox.x2 = slave_priv->crtcs[c]->x + slave_priv->crtcs[c]->mode->mode.width;
newbox.y1 = pScrPriv->crtcs[c]->y; newbox.y1 = slave_priv->crtcs[c]->y;
newbox.y2 = pScrPriv->crtcs[c]->y + pScrPriv->crtcs[c]->mode->mode.height; newbox.y2 = slave_priv->crtcs[c]->y + slave_priv->crtcs[c]->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);
@ -503,7 +503,6 @@ rrCheckPixmapBounding(ScreenPtr pScreen,
new_height == screen_pixmap->drawable.height) { new_height == screen_pixmap->drawable.height) {
ErrorF("adjust shatters %d %d\n", newsize->x1, newsize->x2); ErrorF("adjust shatters %d %d\n", newsize->x1, newsize->x2);
} else { } else {
rrScrPriv(pScreen);
pScrPriv->rrScreenSetSize(pScreen, new_width, new_height, 0, 0); pScrPriv->rrScreenSetSize(pScreen, new_width, new_height, 0, 0);
} }