Revert "disable glyph cache for non 1C application (see eterbug #3101)" This commit...

diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c
index 34011710fe1b6f5bd2d8b04c62fd60a764773846..f4b68ffa5216ba7463f34b9c52394dc67a0cf778 100644 (file)
--- a/dlls/winex11.drv/xrender.c
+++ b/dlls/winex11.drv/xrender.c
@@ -1217,9 +1217,6 @@ static int XRenderErrorHandler(Display *dpy, XErrorEvent *event, void *arg)
     return 1;
 }
 
-#include "wine/etersoft.h"
-
-
 /***********************************************************************
  *   X11DRV_XRender_ExtTextOut
  */
@@ -1243,9 +1240,6 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag
     LOGFONTW lf;
     enum drawable_depth_type depth_type = (physDev->depth == 1) ? mono_drawable : color_drawable;
     Picture tile_pict = 0;
-    BOOL disable_cache;
-    LOADETER_FUNC(etersoft_1version);
-    disable_cache = !(etersoft_1version && etersoft_1version() );
 
     /* Do we need to disable antialiasing because of palette mode? */
     if( !physDev->bitmap || GetObjectW( physDev->bitmap->hbitmap, sizeof(bmp), &bmp ) != sizeof(bmp) ) {
@@ -1360,7 +1354,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag
             if( disable_antialias == FALSE )
                 aa_type = entry->aa_default;
             formatEntry = entry->format[aa_type];
-        } else if( disable_cache || wstr[idx] >= formatEntry->nrealized || formatEntry->realized[wstr[idx]] == FALSE) {
+        } else if( wstr[idx] >= formatEntry->nrealized || formatEntry->realized[wstr[idx]] == FALSE) {
            UploadGlyph(physDev, wstr[idx], aa_type);
        }
     }