aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-07-31 14:14:22 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-07-31 14:14:22 +0200
commitdc8e524073d5b411a942baa2ddd8864cd7e672af (patch)
treee5001258cef8b974c8e26127c751411925ca3e7c /nx-X11/programs
parent7897834ce578dc394649ed09acb9f95fc04915ff (diff)
parentda43f047a0d1f9e3a4850f3e8a15a67e81826dae (diff)
downloadnx-libs-dc8e524073d5b411a942baa2ddd8864cd7e672af.tar.gz
nx-libs-dc8e524073d5b411a942baa2ddd8864cd7e672af.tar.bz2
nx-libs-dc8e524073d5b411a942baa2ddd8864cd7e672af.zip
Merge branch 'sunweaver-pr/fix-multi-trapez-requests' into 3.6.x
Attributes GH PR #496: https://github.com/ArcticaProject/nx-libs/pull/496
Diffstat (limited to 'nx-X11/programs')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Render.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c
index 753134eb3..1ce62b2f2 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Render.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c
@@ -93,12 +93,6 @@ FIXME: Most operations don't seem to produce any visible result
#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).
*/
@@ -1803,8 +1797,6 @@ FIXME: Is this useful or just a waste of bandwidth?
nxagentSynchronizeBox(pDst -> pDrawable, nxagentTrapezoidExtents, NEVER_BREAK);
}
- while (remaining > 0)
- {
XRenderCompositeTrapezoids(nxagentDisplay,
op,
nxagentPicturePriv(pSrc) -> picture,
@@ -1812,13 +1804,8 @@ FIXME: Is this useful or just a waste of bandwidth?
pForm,
xSrc,
ySrc,
- (XTrapezoid *) current,
- (remaining > TRAPEZOIDS_PER_REQUEST ?
- TRAPEZOIDS_PER_REQUEST : remaining));
+ (XTrapezoid *) current,remaining);
- remaining -= TRAPEZOIDS_PER_REQUEST;
- current += TRAPEZOIDS_PER_REQUEST;
- }
#endif