aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Render.c
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2016-04-26 22:35:00 +0200
committerMihai Moldovan <ionic@ionic.de>2016-04-26 22:35:00 +0200
commit12104a232a6de163f7e871be288ac933083c4226 (patch)
tree78ed57fea14b0fb86a5da16c89721b004e760bc3 /nx-X11/programs/Xserver/hw/nxagent/Render.c
parent5729783dbbbaaea835cad2f6621c822c69fe02ea (diff)
parentebcb6a6e172bded13a13963ea03d279541978e8e (diff)
downloadnx-libs-12104a232a6de163f7e871be288ac933083c4226.tar.gz
nx-libs-12104a232a6de163f7e871be288ac933083c4226.tar.bz2
nx-libs-12104a232a6de163f7e871be288ac933083c4226.zip
Merge branch 'sunweaver-pr/libxrender-cleanup' into arctica-3.6.x
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Render.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Render.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c
index c9f589c3b..8bf1ac0bf 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Render.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c
@@ -39,7 +39,7 @@
#define Atom XlibAtom
#define Pixmap XlibPixmap
-#include "../../../../lib/Xrender/Xrenderint.h"
+#include "NXrenderint.h"
#undef Atom
#undef Pixmap
@@ -2273,8 +2273,6 @@ void nxagentAddGlyphs(GlyphSetPtr glyphSet, Glyph *gids, xGlyphInfo *gi,
normalizedImages = images;
}
- XRenderCleanGlyphs(gi, nglyphs, normalizedImages, glyphDepths[glyphSet -> fdepth], nxagentDisplay);
-
XRenderAddGlyphs(nxagentDisplay,
glyphSet -> remoteID,
gids,