aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Ushakov <alexey.ushakov@jetbrains.com>2017-04-13 16:03:53 +0300
committerAlexey Ushakov <alexey.ushakov@jetbrains.com>2017-04-13 16:04:25 +0300
commitdd6f147f30b74e610016a847dbe7ca8abad7d820 (patch)
tree5852ae354c7be8025d4883735fdaf822e37be46c
parenta446cf23227230805432da5d56b5b87d38bf0db9 (diff)
downloadjdk8u_jdk-dd6f147f30b74e610016a847dbe7ca8abad7d820.tar.gz
JRE-294 Incorrect font rendering on Fedora core 25 (Wayland)jb8u152-b826
Disable xrender pipeline on Wayland
-rw-r--r--src/solaris/classes/sun/awt/X11GraphicsEnvironment.java14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java b/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java
index bcb2c727ba..19c1846028 100644
--- a/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java
+++ b/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java
@@ -126,10 +126,16 @@ public class X11GraphicsEnvironment
// only attempt to initialize Xrender if it was requested
if (xRenderRequested) {
- xRenderAvailable = initXRender(xRenderVerbose, xRenderIgnoreLinuxVersion);
- if (xRenderVerbose && !xRenderAvailable) {
- System.out.println(
- "Could not enable XRender pipeline");
+ String waylandDisplay = System.getenv("WAYLAND_DISPLAY");
+ // Do not use Xrender on Wayland
+ if (waylandDisplay == null) {
+ xRenderAvailable = initXRender(xRenderVerbose, xRenderIgnoreLinuxVersion);
+ if (xRenderVerbose && !xRenderAvailable) {
+ System.out.println(
+ "Could not enable XRender pipeline");
+ }
+ } else {
+ System.out.println("XRender is not supported on Wayland");
}
}