Skip to content

Commit 99590ab

Browse files
committed
render: PanoramiXRenderComposite() drop stuff pointer
This pointer just had been kept in at previous commit for keeping the diff small and so easier to review. Now accessing the fields within the local struct directly, dropping the extra pointer. Signed-off-by: Enrico Weigelt, metux IT consult <[email protected]>
1 parent d9e0c04 commit 99590ab

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

render/render.c

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2108,27 +2108,26 @@ PanoramiXRenderComposite(ClientPtr client, xRenderCompositeReq *orig_req)
21082108
VERIFY_XIN_PICTURE(dst, orig.dst, client, DixWriteAccess);
21092109

21102110
xRenderCompositeReq sub_req = orig;
2111-
xRenderCompositeReq *stuff = &sub_req;
21122111

21132112
XINERAMA_FOR_EACH_SCREEN_FORWARD({
2114-
stuff->src = src->info[walkScreenIdx].id;
2113+
sub_req.src = src->info[walkScreenIdx].id;
21152114
if (src->u.pict.root) {
2116-
stuff->xSrc = orig.xSrc - walkScreen->x;
2117-
stuff->ySrc = orig.ySrc - walkScreen->y;
2115+
sub_req.xSrc = orig.xSrc - walkScreen->x;
2116+
sub_req.ySrc = orig.ySrc - walkScreen->y;
21182117
}
2119-
stuff->dst = dst->info[walkScreenIdx].id;
2118+
sub_req.dst = dst->info[walkScreenIdx].id;
21202119
if (dst->u.pict.root) {
2121-
stuff->xDst = orig.xDst - walkScreen->x;
2122-
stuff->yDst = orig.yDst - walkScreen->y;
2120+
sub_req.xDst = orig.xDst - walkScreen->x;
2121+
sub_req.yDst = orig.yDst - walkScreen->y;
21232122
}
21242123
if (msk) {
2125-
stuff->mask = msk->info[walkScreenIdx].id;
2124+
sub_req.mask = msk->info[walkScreenIdx].id;
21262125
if (msk->u.pict.root) {
2127-
stuff->xMask = orig.xMask - walkScreen->x;
2128-
stuff->yMask = orig.yMask - walkScreen->y;
2126+
sub_req.xMask = orig.xMask - walkScreen->x;
2127+
sub_req.yMask = orig.yMask - walkScreen->y;
21292128
}
21302129
}
2131-
result = SingleRenderComposite(client, stuff);
2130+
result = SingleRenderComposite(client, &sub_req);
21322131
if (result != Success)
21332132
break;
21342133
});

0 commit comments

Comments
 (0)