OpenJDK / amber / amber
changeset 49774:92b1cb4cd716
8200129: Remove D3D Performance Counter.
Reviewed-by: alanb, serb
| author | prr |
|---|---|
| date | Thu, 22 Mar 2018 14:02:20 -0700 |
| parents | ab72158ccd9d |
| children | edbc57573a1c |
| files | src/java.base/share/classes/jdk/internal/perf/PerfCounter.java src/java.base/share/classes/module-info.java src/java.base/unix/classes/module-info.java.extra src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java |
| diffstat | 4 files changed, 1 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/java.base/share/classes/jdk/internal/perf/PerfCounter.java Thu Mar 22 11:34:38 2018 -0700 +++ b/src/java.base/share/classes/jdk/internal/perf/PerfCounter.java Thu Mar 22 14:02:20 2018 -0700 @@ -133,10 +133,6 @@ static final PerfCounter zfot = newPerfCounter("sun.zip.zipFile.openTime"); } - static class WindowsClientCounters { - static final PerfCounter d3dAvailable = newConstantPerfCounter("sun.java2d.d3d.available"); - } - /** * Number of findClass calls */ @@ -182,10 +178,4 @@ return CoreCounters.zfot; } - /** - * D3D graphic pipeline available - */ - public static PerfCounter getD3DAvailable() { - return WindowsClientCounters.d3dAvailable; - } }
--- a/src/java.base/share/classes/module-info.java Thu Mar 22 11:34:38 2018 -0700 +++ b/src/java.base/share/classes/module-info.java Thu Mar 22 14:02:20 2018 -0700 @@ -186,7 +186,6 @@ jdk.jartool, jdk.jlink; exports jdk.internal.perf to - java.desktop, java.management, jdk.management.agent, jdk.internal.jvmstat; @@ -233,7 +232,6 @@ jdk.sctp, jdk.unsupported; exports sun.nio.cs to - java.desktop, jdk.charsets; exports sun.nio.fs to jdk.unsupported;
--- a/src/java.base/unix/classes/module-info.java.extra Thu Mar 22 11:34:38 2018 -0700 +++ b/src/java.base/unix/classes/module-info.java.extra Thu Mar 22 14:02:20 2018 -0700 @@ -23,3 +23,4 @@ * questions. */ +exports sun.nio.cs to java.desktop;
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java Thu Mar 22 11:34:38 2018 -0700 +++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java Thu Mar 22 14:02:20 2018 -0700 @@ -38,7 +38,6 @@ import java.awt.peer.WindowPeer; import java.util.ArrayList; -import jdk.internal.perf.PerfCounter; import sun.awt.AWTAccessor; import sun.awt.AWTAccessor.ComponentAccessor; import sun.awt.Win32GraphicsDevice; @@ -70,9 +69,6 @@ if (d3dAvailable) { // we don't use pixel formats for the d3d pipeline pfDisabled = true; - PerfCounter.getD3DAvailable().set(1); - } else { - PerfCounter.getD3DAvailable().set(0); } }