Unverified Commit dc8e5240 authored by Mike Gabriel's avatar Mike Gabriel

Merge branch 'sunweaver-pr/fix-multi-trapez-requests' into 3.6.x

parents 7897834c da43f047
...@@ -93,12 +93,6 @@ FIXME: Most operations don't seem to produce any visible result ...@@ -93,12 +93,6 @@ FIXME: Most operations don't seem to produce any visible result
#undef SKIP_REALLY_ALL_LOUSY_RENDER_OPERATIONS #undef SKIP_REALLY_ALL_LOUSY_RENDER_OPERATIONS
/* /*
* Do we split the big trapezoid requests?
*/
#define TRAPEZOIDS_PER_REQUEST 256
/*
* Margin added around the glyphs extent (in pixels). * Margin added around the glyphs extent (in pixels).
*/ */
...@@ -1803,8 +1797,6 @@ FIXME: Is this useful or just a waste of bandwidth? ...@@ -1803,8 +1797,6 @@ FIXME: Is this useful or just a waste of bandwidth?
nxagentSynchronizeBox(pDst -> pDrawable, nxagentTrapezoidExtents, NEVER_BREAK); nxagentSynchronizeBox(pDst -> pDrawable, nxagentTrapezoidExtents, NEVER_BREAK);
} }
while (remaining > 0)
{
XRenderCompositeTrapezoids(nxagentDisplay, XRenderCompositeTrapezoids(nxagentDisplay,
op, op,
nxagentPicturePriv(pSrc) -> picture, nxagentPicturePriv(pSrc) -> picture,
...@@ -1812,13 +1804,8 @@ FIXME: Is this useful or just a waste of bandwidth? ...@@ -1812,13 +1804,8 @@ FIXME: Is this useful or just a waste of bandwidth?
pForm, pForm,
xSrc, xSrc,
ySrc, ySrc,
(XTrapezoid *) current, (XTrapezoid *) current,remaining);
(remaining > TRAPEZOIDS_PER_REQUEST ?
TRAPEZOIDS_PER_REQUEST : remaining));
remaining -= TRAPEZOIDS_PER_REQUEST;
current += TRAPEZOIDS_PER_REQUEST;
}
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment